Merge branch 'ignite-sprint-5' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9300ca61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9300ca61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9300ca61 Branch: refs/heads/ignite-gg-10249 Commit: 9300ca616f8faed6b56287949d48a23e269c5b4c Parents: 593d862 addc91b Author: ashutak <ashu...@gridgain.com> Authored: Wed Jun 10 17:31:32 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Wed Jun 10 17:31:32 2015 +0300 ---------------------------------------------------------------------- .../client/memcache/MemcacheRestExample.java | 32 ++++++++++---------- .../java/org/apache/ignite/IgniteCache.java | 25 ++++++++++++++- .../affinity/GridAffinityAssignmentCache.java | 5 ++- .../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 +- .../ignite/testframework/GridTestUtils.java | 2 +- 10 files changed, 64 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
