Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63575bb8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63575bb8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63575bb8 Branch: refs/heads/ignite-323 Commit: 63575bb8bb3a892f64b5062c5a608f6b8bc538d3 Parents: f8a1317 fa21d8c Author: Denis Magda <dma...@gridgain.com> Authored: Tue Jul 21 14:36:08 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Jul 21 14:36:08 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../AffinityNodeAddressHashResolver.java | 8 +- .../affinity/AffinityNodeHashResolver.java | 5 + .../affinity/AffinityNodeIdHashResolver.java | 6 + .../rendezvous/RendezvousAffinityFunction.java | 22 +++- .../configuration/CacheConfiguration.java | 4 +- .../configuration/IgniteConfiguration.java | 26 +++++ .../apache/ignite/internal/IgniteKernal.java | 3 + .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheProcessor.java | 113 ++++++++++++------- .../processors/cache/IgniteInternalCache.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 21 +++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 18 ++- ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 1 + 17 files changed, 260 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
