Repository: ignite
Updated Branches:
refs/heads/ignite-db-x-10884 3f67466c9 -> 4a8fb8f34
Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4a8fb8f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4a8fb8f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4a8fb8f3
Branch: refs/heads/ignite-db-x-10884
Commit: 4a8fb8f344c3884fb72717e1ff979cfa1217d231
Parents: 3f67466
Author: sboikov <[email protected]>
Authored: Thu Apr 28 16:25:04 2016 +0300
Committer: sboikov <[email protected]>
Committed: Thu Apr 28 16:25:04 2016 +0300
----------------------------------------------------------------------
.../internal/direct/stream/v2/DirectByteBufferStreamImplV2.java | 1 -
.../apache/ignite/internal/mem/file/MappedFileMemoryProvider.java | 2 --
.../java/org/apache/ignite/internal/visor/cache/VisorCacheV3.java | 1 -
3 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8fb8f3/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
index c6313e5..d7dc990 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.direct.stream.v2;
import java.lang.reflect.Array;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8fb8f3/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
index 7e22ccc..0039b09 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
@@ -26,9 +26,7 @@ import java.util.List;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.mem.DirectMemory;
-import org.apache.ignite.internal.mem.DirectMemoryFragment;
import org.apache.ignite.internal.mem.DirectMemoryProvider;
-import org.apache.ignite.internal.mem.OutOfMemoryException;
import org.apache.ignite.lifecycle.LifecycleAware;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8fb8f3/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheV3.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheV3.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheV3.java
index 8d71724..29c070d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheV3.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheV3.java
@@ -24,7 +24,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
-import org.apache.ignite.internal.processors.cache.GridCacheSwapManager;
import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManager;
import org.apache.ignite.internal.util.lang.GridTuple3;
import org.apache.ignite.internal.util.lang.IgnitePair;
