Merge remote-tracking branch 'remotes/origin/ignite-gg-9828' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b1aff167 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b1aff167 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b1aff167 Branch: refs/heads/ignite-471 Commit: b1aff16721acc17d459537e49f3a2837fbf0f822 Parents: 4573475 ce3dd32 Author: ivasilinets <[email protected]> Authored: Thu Mar 12 17:19:58 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Mar 12 17:19:58 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
