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/21 15:57:53 UTC
[6/6] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1090
Merge remote-tracking branch 'remotes/origin/master' into ignite-1090
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/869ac6cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/869ac6cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/869ac6cf
Branch: refs/heads/ignite-1090
Commit: 869ac6cf958cb1adbe5cc1a86541051059228643
Parents: 1617a99 73a2b14
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 21 16:56:42 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 21 16:56:42 2015 +0300
----------------------------------------------------------------------
modules/apache-license-gen/pom.xml | 13 ---
.../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/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, 278 insertions(+), 95 deletions(-)
----------------------------------------------------------------------