Merge remote-tracking branch 'origin/ignite-96' into ignite-96
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e4d9a6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e4d9a6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e4d9a6a Branch: refs/heads/sprint-1 Commit: 9e4d9a6a6ea8208b13e2d9a641348596f2699570 Parents: db9d607 7261baa Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Feb 11 15:23:24 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Feb 11 15:23:24 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheSwapManager.java | 2 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 282 +++++++++---------- .../GridCacheReferenceCleanupSelfTest.java | 3 +- ...tractDistributedByteArrayValuesSelfTest.java | 2 +- .../core/src/test/webapp/META-INF/gg-config.xml | 7 - 5 files changed, 144 insertions(+), 152 deletions(-) ----------------------------------------------------------------------
