Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa676326 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa676326 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa676326 Branch: refs/heads/ignite-45 Commit: aa6763269a04b837be1a4fda578f1cda767fcc6a Parents: b473e30 963e9c2 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sat Mar 21 14:59:42 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sat Mar 21 14:59:42 2015 -0700 ---------------------------------------------------------------------- .../affinity/GridAffinityProcessor.java | 12 ---------- .../cache/GridCacheAtomicVersionComparator.java | 21 +++++++++-------- .../processors/cache/GridCacheMapEntry.java | 24 ++++++++++++-------- .../GridCacheVersionConflictResolver.java | 2 +- 4 files changed, 26 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
