Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg9499
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af14b521 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af14b521 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af14b521 Branch: refs/heads/sprint-1 Commit: af14b521c2e5e9b7ca20ed607844f978258b38d7 Parents: ebd548c 5fd0d7c Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Dec 30 18:08:11 2014 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Dec 30 18:08:11 2014 +0300 ---------------------------------------------------------------------- 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 +- .../interop/GridInteropProcessor.java | 9 + .../interop/os/GridOsInteropProcessor.java | 5 + .../java/org/gridgain/grid/util/GridUtils.java | 10 + .../tcp/GridOrderedMessageCancelSelfTest.java | 205 ------------------ .../gridgain/grid/lang/IgniteUuidSelfTest.java | 3 + .../gridgain/testframework/GridTestUtils.java | 7 + .../testframework/junits/GridAbstractTest.java | 5 +- .../GridCacheDataStructuresSelfTestSuite.java | 5 +- .../bamboo/GridCacheFailoverTestSuite.java | 8 +- .../bamboo/GridComputeGridTestSuite.java | 1 - .../query/h2/opt/GridH2AbstractKeyValueRow.java | 4 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 2 + .../tcp/GridOrderedMessageCancelSelfTest.java | 211 +++++++++++++++++++ .../testsuites/GridCacheQuerySelfTestSuite.java | 3 + 20 files changed, 272 insertions(+), 223 deletions(-) ----------------------------------------------------------------------
