Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-57
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d4866d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d4866d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d4866d5 Branch: refs/heads/ignite-61 Commit: 2d4866d5ba367995c6127ccaf0cd86827b4abc76 Parents: 7d9dbf7 d227081 Author: sboikov <sboi...@gridgain.com> Authored: Fri Feb 6 16:56:49 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Feb 6 16:56:49 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheBasicStoreAbstractTest.java | 63 ++++++++++---------- .../colocation/GridTestLifecycleBean.java | 3 +- 2 files changed, 35 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
