Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-143
Conflicts:
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63845f47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63845f47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63845f47
Branch: refs/heads/ignite-143
Commit: 63845f47d1c095781ee2a40e78e426d6734ab100
Parents: a0f32e5 420c74f
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Thu Feb 12 13:13:22 2015 -0800
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Thu Feb 12 13:13:22 2015 -0800
----------------------------------------------------------------------
.../org/apache/ignite/cache/CacheManager.java | 32 +++----
.../configuration/IgniteConfiguration.java | 26 ++++++
.../org/apache/ignite/internal/IgnitionEx.java | 1 +
.../GridDeploymentPerVersionStore.java | 4 +-
.../cache/CacheVersionedEntryImpl.java | 9 --
.../cache/GridCacheDeploymentManager.java | 14 ++-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 12 ++-
.../cache/GridCacheOffHeapSelfTest.java | 46 ++++------
...IgniteCacheAbstractExecutionContextTest.java | 96 ++++++++++++++++++++
.../IgniteCacheAtomicExecutionContextTest.java | 49 ++++++++++
...iteCachePartitionedExecutionContextTest.java | 49 ++++++++++
...niteCacheReplicatedExecutionContextTest.java | 49 ++++++++++
.../IgniteCacheTxExecutionContextTest.java | 49 ++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 7 ++
.../tests/p2p/CacheDeploymentTestValue.java | 2 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 23 +++--
.../processors/cache/GridCacheSwapSelfTest.java | 40 ++++----
18 files changed, 413 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63845f47/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63845f47/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63845f47/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63845f47/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index 53de1fe,99d7578..8d601b1
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@@ -20,9 -20,9 +20,10 @@@ package org.apache.ignite.internal.proc
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
+ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63845f47/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63845f47/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
