Merge branch 'ignite-2523-1-resp' into ignite-2523-1-resp-dht # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ef68687 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ef68687 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ef68687 Branch: refs/heads/ignite-2523-1-resp-dht Commit: 4ef68687688816018ffed08cc8049a5eb713eb87 Parents: a676069 834c9da Author: vozerov-gridgain <[email protected]> Authored: Thu Apr 28 16:40:01 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Apr 28 16:40:01 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 16 ++- .../dht/GridClientPartitionTopology.java | 6 +- .../dht/GridDhtPartitionTopology.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../processors/cluster/GridUpdateNotifier.java | 3 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 10 ++ ...GridServiceProxyClientReconnectSelfTest.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 34 +++++ .../properties/NotStringSystemPropertyTest.java | 124 +++++++++++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../Apache.Ignite.Linq.nuspec | 5 +- 14 files changed, 209 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
