[27/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-45' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45

[sboikov]

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

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
        modules/core/src/main/resources/META-INF/classnames.properties


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fbe025f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fbe025f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fbe025f6

Branch: refs/heads/ignite-525
Commit: fbe025f6836cad2f52a1ac7414865e6c3d998e7b
Parents: 317e4bb
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Fri Mar 20 12:46:03 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Fri Mar 20 12:46:03 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAffinityManager.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fbe025f6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index ead3aeb..b9e2f99 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -33,9 +33,6 @@ import java.util.*;
  * Cache affinity manager.
  */
 public class GridCacheAffinityManager extends GridCacheManagerAdapter {
-    /** Factor for maximum number of attempts to calculate all partition 
affinity keys. */
-    private static final int MAX_PARTITION_KEY_ATTEMPT_RATIO = 10;
-
     /** */
     private static final AffinityTopologyVersion TOP_FIRST = new 
AffinityTopologyVersion(1);
 
@@ -165,7 +162,7 @@ public class GridCacheAffinityManager extends 
GridCacheManagerAdapter {
      * @param key Key.
      * @return Partition.
      */
-    public <T> int partition(Object key) {
+    public int partition(Object key) {
         return aff.partition(key);
     }