Merge branch 'ignite-286' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-286
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ac387ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ac387ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ac387ac Branch: refs/heads/ignite-286 Commit: 9ac387ac34853eec09b1874afe1c8aacdd0d4ee2 Parents: a49691a 5d5bdee Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed May 6 15:44:44 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed May 6 15:44:44 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheSwapManager.java | 40 +++++++++++--------- .../cache/query/GridCacheQueryManager.java | 4 +- .../cache/OffHeapTieredTransactionSelfTest.java | 1 - 3 files changed, 24 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
