Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39dace45 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39dace45 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39dace45 Branch: refs/heads/ignite-1093-2 Commit: 39dace45c81aef7cb913fcf4f98a7d71e34beebd Parents: f0be45e a104087 Author: S.Vladykin <[email protected]> Authored: Tue Sep 22 13:38:21 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Tue Sep 22 13:38:21 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +-- .../processors/cache/GridCacheProcessor.java | 2 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 ++++++++++++++++++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- 4 files changed, 125 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
