You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/21 14:23:06 UTC
[3/3] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-961-master' into ignite-961
Merge remote-tracking branch 'remotes/origin/ignite-961-master' 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/2aa05e42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2aa05e42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2aa05e42
Branch: refs/heads/ignite-961
Commit: 2aa05e425026bc29bd65129d9ef6f6036e9fc968
Parents: 4699dd8 cdf8da8
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Jul 21 15:18:58 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Jul 21 15:18:58 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aa05e42/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------