ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject incubator-ignite git commit: Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96
Date Thu, 12 Feb 2015 14:04:36 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-96 080c68f44 -> 24063dd40


Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-96

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
	modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.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/24063dd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24063dd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24063dd4

Branch: refs/heads/ignite-96
Commit: 24063dd4087c92a1d501bb0c06dd9a48280bd9da
Parents: 080c68f
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Feb 12 17:04:32 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Thu Feb 12 17:04:32 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +-
 .../apache/ignite/internal/processors/fs/GridGgfsDataManager.java  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24063dd4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 0c8fa66..090d047 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -4475,7 +4475,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K,
V>
 
         /** {@inheritDoc} */
         @Override public String toString() {
-            return "IteratorEntry [key=" + key + ']';
+            return "LazyValueEntry [key=" + key + ']';
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24063dd4/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
index c93cd34..67bf31c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
@@ -43,7 +43,6 @@ import org.apache.ignite.thread.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.*;
 import javax.cache.processor.*;
 import java.io.*;
 import java.nio.*;


Mime
View raw message