You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/02 12:23:27 UTC
[1/2] ignite git commit: Minor.
Repository: ignite
Updated Branches:
refs/heads/master d734b6e4d -> da29a706f
Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7016bd96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7016bd96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7016bd96
Branch: refs/heads/master
Commit: 7016bd963f599a3319eba32e1a165e3e9109d969
Parents: fdcd47b
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 2 13:12:49 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 2 13:12:49 2015 +0300
----------------------------------------------------------------------
.../internal/processors/affinity/GridAffinityProcessor.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7016bd96/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index 996edd7..090aca0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -577,6 +577,9 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
return assignment;
}
+ /**
+ * @return Key mapper.
+ */
private AffinityKeyMapper keyMapper() {
return mapper;
}
@@ -888,6 +891,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
/**
* @return Affinity info for current topology version.
+ * @throws IgniteCheckedException If failed.
*/
private AffinityInfo cache() throws IgniteCheckedException {
return affinityCache(cacheName, new AffinityTopologyVersion(topologyVersion()));
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da29a706
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da29a706
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da29a706
Branch: refs/heads/master
Commit: da29a706f59cb32c8cf1e72cdd97239281723d0e
Parents: d734b6e 7016bd9
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 2 13:23:41 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 2 13:23:41 2015 +0300
----------------------------------------------------------------------
.../internal/processors/affinity/GridAffinityProcessor.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------