Merge branches 'ignite-1015' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1015
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2e1dea94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2e1dea94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2e1dea94 Branch: refs/heads/ignite-752 Commit: 2e1dea945b486006214eaa8005a7d3b398c8f549 Parents: 5202527 c044bb8 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Jul 22 15:11:38 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Jul 22 15:11:38 2015 +0300 ---------------------------------------------------------------------- .../IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java | 5 +++++ 1 file changed, 5 insertions(+) ----------------------------------------------------------------------