Merge branch 'ignite-1.3.3'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44aaceca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44aaceca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44aaceca Branch: refs/heads/ignite-946 Commit: 44aaceca596f5d4b738f9da8d12e9af4e0431379 Parents: c087be2 7d747d2 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Aug 5 11:27:50 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Aug 5 11:27:50 2015 +0300 ---------------------------------------------------------------------- .../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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ----------------------------------------------------------------------
