Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-44
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fd61c914 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd61c914 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd61c914 Branch: refs/heads/ignite-54 Commit: fd61c914e9753ec97ff6fbd4a5f8e58f2741927b Parents: 71b0b81 d3d6787 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 30 12:29:27 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 30 12:29:27 2014 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteException.java | 2 +- .../processors/cache/GridCacheAdapter.java | 4 +- .../java/org/gridgain/grid/util/GridUtils.java | 10 + .../tcp/GridOrderedMessageCancelSelfTest.java | 211 ------------------- .../gridgain/grid/lang/IgniteUuidSelfTest.java | 3 + .../gridgain/testframework/GridTestUtils.java | 7 + .../testframework/junits/GridAbstractTest.java | 2 +- .../GridCacheDataStructuresSelfTestSuite.java | 5 +- .../bamboo/GridCacheFailoverTestSuite.java | 5 +- .../bamboo/GridComputeGridTestSuite.java | 1 - .../query/h2/opt/GridH2AbstractKeyValueRow.java | 4 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 2 + .../tcp/GridOrderedMessageCancelSelfTest.java | 211 +++++++++++++++++++ .../testsuites/GridCacheQuerySelfTestSuite.java | 3 + 14 files changed, 248 insertions(+), 222 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd61c914/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
