Merge branches 'ignite-143' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-futures-cleanup-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73583be3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73583be3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73583be3 Branch: refs/heads/ignite-383 Commit: 73583be39750563d503e3db6f1bc55b0a97bc725 Parents: 07abc0a 9b0ba86 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Sat Mar 7 00:45:33 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Sat Mar 7 00:45:33 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheUtils.java | 2 +- .../cache/GridCacheWriteBehindStore.java | 4 ++-- .../ignite/internal/util/IgniteUtils.java | 23 ++++++++++++++++++-- ...cheTransactionalAbstractMetricsSelfTest.java | 7 ++++++ .../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +++---- .../distributed/GridCacheLockAbstractTest.java | 2 ++ .../ignite/testframework/GridTestUtils.java | 2 +- 7 files changed, 38 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73583be3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73583be3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ----------------------------------------------------------------------
