Merge branch 'ignite-961' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a191c8d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a191c8d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a191c8d2 Branch: refs/heads/ignite-961 Commit: a191c8d29fb456cb9cca26f5f72f17c8d11c8178 Parents: 79c1e24 2aa05e4 Author: ivasilinets <[email protected]> Authored: Tue Jul 21 15:26:03 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Tue Jul 21 15:26:03 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 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 18 ++- ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 1 + 16 files changed, 244 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
