Merge branch 'ignite-2523-1' into ignite-2523-1-resp
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/834c9da6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/834c9da6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/834c9da6 Branch: refs/heads/ignite-2523-1 Commit: 834c9da6c87c856d5228059bae5ef6db63510464 Parents: f163aba 5d4af1a Author: vozerov-gridgain <[email protected]> Authored: Thu Apr 28 16:39:08 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Apr 28 16:39:08 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/GridDhtAtomicUpdateFuture.java | 8 +- .../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 +- 15 files changed, 215 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/834c9da6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/834c9da6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ----------------------------------------------------------------------
