Merge remote-tracking branch 'remotes/origin/master' into ignite-1329
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f647710 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f647710 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f647710 Branch: refs/heads/ignite-1329 Commit: 1f64771053decf874667574d407b4558d7f0cb33 Parents: ad47328 bf7591b Author: sboikov <[email protected]> Authored: Fri Sep 25 12:04:21 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 25 12:04:21 2015 +0300 ---------------------------------------------------------------------- examples/schema-import/pom.xml | 10 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../GridCacheVariableTopologySelfTest.java | 3 +- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++++++++++++++++++ .../multijvm/IgniteCacheProcessProxy.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 23 +- pom.xml | 1 + 8 files changed, 238 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
