[16/20] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-630

[av]

Merge remote-tracking branch 'remotes/origin/master' into ignite-630

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.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/79ba5a79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79ba5a79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79ba5a79

Branch: refs/heads/master
Commit: 79ba5a7924b1ba5303a31b3c6a44ad3dc2ede9b4
Parents: dc18c3d
Author: Anton Vinogradov <avinogra...@gridgain.com>
Authored: Fri Jul 17 15:49:37 2015 +0300
Committer: Anton Vinogradov <avinogra...@gridgain.com>
Committed: Fri Jul 17 15:49:37 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 3 ++-
 .../apache/ignite/internal/processors/cache/GridCacheEntryEx.java | 3 +--
 .../internal/processors/cache/eviction/GridCacheMockEntry.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ba5a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 0c6fcf1..aef1d64 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1375,7 +1375,8 @@ public abstract class GridCacheAdapter<K, V> implements 
IgniteInternalCache<K, V
 
                                     if (log.isDebugEnabled()) {
                                         log.debug("Set value loaded from store 
into entry [set=" + set + ", " +
-                                            "newVer=" + nextVer + ", entry=" + 
entry + ']');
+                                            "curVer=" +
+                                            curVer + ", newVer=" + nextVer + 
", entry=" + entry + ']');
                                     }
                                 }
                                 else {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ba5a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index f50d6b2..c2d0271 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -943,11 +943,10 @@ public interface GridCacheEntryEx {
      * @param <V> Value type.
      * @return {@code True} if value was removed, {@code false} otherwise.
      */
-    public <V> boolean removeMeta(UUID name, V val);
+    public <V> boolean removeMeta(int key, V val);
 
     /**
      * Calls {@link GridDhtLocalPartition#onUnlock()} for this entry's 
partition.
      */
     public void onUnlock();
-    public <V> boolean removeMeta(int key, V val);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ba5a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
index 333fae5..7a32596 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java
@@ -30,7 +30,7 @@ import javax.cache.*;
  */
 public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter 
implements Cache.Entry<K, V>, EvictableEntry<K, V> {
     /** */
-    private static final int META_KEY = EntryKey.values().length; //+1 to 
maximum value
+    private static final int META_KEY = EntryKey.values().length; //+1 to 
maximum value (test only case)
 
     /** */
     @GridToStringInclude