[11/12] 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

[yzhdanov]

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/cache/GridCacheAdapter.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/5f92028b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f92028b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f92028b

Branch: refs/heads/ignite-96
Commit: 5f92028bd3f1c803fa8294799b7d459f73751903
Parents: 9ff5970
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Mon Feb 9 23:40:21 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Mon Feb 9 23:40:21 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java       | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f92028b/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 4c55180..a4e01fa 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
@@ -4949,11 +4949,7 @@ public abstract class GridCacheAdapter<K, V> implements 
GridCache<K, V>,
      * @param filter Filters to evaluate.
      * @return Key set.
      */
-<<<<<<< HEAD
     public Set<K> keySet(@Nullable IgnitePredicate<Cache.Entry<K, V>>... 
filter) {
-=======
-    @Override public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K, 
V>>... filter) {
->>>>>>> 6a90e0f772cd59b2e21d1788e68a6175d901cb67
         return map.keySet(filter);
     }