ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [12/12] incubator-ignite git commit: IGNITE-323 Merge from master
Date Tue, 21 Jul 2015 15:00:31 GMT
IGNITE-323 Merge from 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/7a057555
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a057555
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a057555

Branch: refs/heads/ignite-323
Commit: 7a057555aaefb157ce24798b94b8d445ca680666
Parents: 94af74d 73a2b14
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Jul 21 18:00:17 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Tue Jul 21 18:00:17 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 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   7 +-
 .../ignite/internal/util/IgniteUtils.java       |  21 +++-
 .../ignite/internal/util/nio/GridNioServer.java |   9 ++
 .../util/nio/GridSelectorNioSessionImpl.java    |   8 ++
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  58 ++++++----
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   3 +-
 .../tcp/internal/TcpDiscoveryNode.java          |  18 ++-
 .../cache/CacheAffinityCallSelfTest.java        |  10 +-
 .../internal/util/nio/GridNioSelfTest.java      |  88 +++++++++++++--
 .../internal/util/nio/GridNioSslSelfTest.java   |  16 ++-
 ...DiscoveryNodeConfigConsistentIdSelfTest.java |  76 +++++++++++++
 .../testframework/junits/GridAbstractTest.java  |   3 +-
 .../IgniteSpiDiscoverySelfTestSuite.java        |   1 +
 26 files changed, 409 insertions(+), 126 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 73db5fe,823ddcd..bd16fbe
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -401,9 -401,9 +402,12 @@@ public class IgniteConfiguration 
      /** Cache store session listeners. */
      private Factory<CacheStoreSessionListener>[] storeSesLsnrs;
  
+     /** Consistent globally unique node ID which survives node restarts. */
+     private Serializable consistentId;
+ 
 +    /** SSL connection factory. */
 +    private GridSslContextFactory sslCtxFactory;
 +
      /**
       * Creates valid grid configuration with all default values.
       */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
----------------------------------------------------------------------


Mime
View raw message