Merge remote-tracking branch 'remotes/origin/master' into ignite-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/9996c90e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9996c90e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9996c90e Branch: refs/heads/ignite-54 Commit: 9996c90eacabc91830fa2f6970dc33f346a4ccd7 Parents: 2540451 6fd75f9 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 30 12:06:42 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 30 12:06:42 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 + .../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 + 13 files changed, 247 insertions(+), 221 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9996c90e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
