Merge branches 'ignite-32' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/802b2267 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/802b2267 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/802b2267 Branch: refs/heads/ignite-32 Commit: 802b2267ef40ab147fa27acd61ff2c0f6bdc21f3 Parents: 477325d 6fd75f9 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Dec 30 15:55:21 2014 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Dec 30 15:55:21 2014 +0700 ---------------------------------------------------------------------- modules/core/pom.xml | 2 +- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../java/org/apache/ignite/IgniteException.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../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 + 17 files changed, 253 insertions(+), 226 deletions(-) ----------------------------------------------------------------------
