Merge remote-tracking branch 'remotes/origin/master' into ignite-1109
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e04d2b80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e04d2b80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e04d2b80 Branch: refs/heads/ignite-1109 Commit: e04d2b80218433352fce0452ecde7537f533d289 Parents: 1b987a0 f62744e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 20 22:28:58 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 20 22:28:58 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 9 ++++----- .../internal/IgniteClientReconnectFailoverTest.java | 6 ++++++ .../processors/cache/CacheAffinityCallSelfTest.java | 14 ++++++++++---- .../GridCachePartitionedMultiNodeFullApiSelfTest.java | 4 +++- pom.xml | 12 ++++++------ 5 files changed, 29 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
