You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/23 11:59:50 UTC
[11/32] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
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/73a2b149
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73a2b149
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73a2b149
Branch: refs/heads/ignite-788-last-review
Commit: 73a2b14901c5aecd20935c8c1a1f653544d608eb
Parents: 5e85f29 63575bb
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Tue Jul 21 14:58:00 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Tue Jul 21 14:58:00 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 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java | 58 ++++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
.../tcp/internal/TcpDiscoveryNode.java | 18 ++-
...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++++++++++++
.../IgniteSpiDiscoverySelfTestSuite.java | 1 +
18 files changed, 294 insertions(+), 87 deletions(-)
----------------------------------------------------------------------