Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c279fca9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c279fca9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c279fca9 Branch: refs/heads/ignite-1301 Commit: c279fca96e16b54482725bbca4d9a30b33144c33 Parents: 28c8dc7 b132006 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Aug 27 13:58:34 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Aug 27 13:58:34 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
