Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b2344a1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b2344a1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b2344a1b Branch: refs/heads/ignite-843 Commit: b2344a1bbffed85f5a23deff8d0174cf253bd49b Parents: 3328cda 44aacec Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Aug 5 15:33:21 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Aug 5 15:33:21 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheProcessor.java | 10 +++- .../processors/cache/GridCacheUtils.java | 1 - .../ignite/internal/util/GridLogThrottle.java | 63 +++++++++++++++----- .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 +++++ .../query/h2/twostep/GridMapQueryExecutor.java | 7 ++- .../h2/twostep/GridReduceQueryExecutor.java | 7 ++- 8 files changed, 87 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
