Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6399813 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6399813 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6399813 Branch: refs/heads/ignite-929 Commit: d639981398b2564a0abd300e9026a5a01b8f67c8 Parents: 87c8d8d 2454eb5 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Thu Jun 11 01:34:11 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Thu Jun 11 01:34:11 2015 +0300 ---------------------------------------------------------------------- .../client/memcache/MemcacheRestExample.java | 32 ++-- .../java/org/apache/ignite/IgniteCache.java | 25 ++- .../apache/ignite/IgniteSystemProperties.java | 3 + .../affinity/GridAffinityAssignmentCache.java | 8 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/IgniteInternalCache.java | 27 +-- .../internal/visor/query/VisorQueryJob.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 16 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../RoundRobinGlobalLoadBalancer.java | 2 +- .../distributed/IgniteCacheManyClientsTest.java | 169 +++++++++++++++++++ .../ignite/testframework/GridTestUtils.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + 14 files changed, 241 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6399813/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6399813/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ----------------------------------------------------------------------
