Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f589cfa6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f589cfa6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f589cfa6 Branch: refs/heads/ignite-release-test-no-mod Commit: f589cfa64f451640ee08162231737262d5b820a9 Parents: 13764cb 7440aba Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Mar 5 20:28:01 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Mar 5 20:28:01 2015 +0700 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearCacheAdapter.java | 8 ++++++++ .../processors/cache/GridCacheConcurrentMapTest.java | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
