You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/06/22 05:56:27 UTC
[1/2] karaf-cellar git commit: Fix for discovered members property
name
Repository: karaf-cellar
Updated Branches:
refs/heads/master dee8c4226 -> cc877e2b3
Fix for discovered members property name
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/176a7f2d
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/176a7f2d
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/176a7f2d
Branch: refs/heads/master
Commit: 176a7f2d78529b4cdb314005a541cae4cc619109
Parents: 0f49d5d
Author: Victor Antonovich <v....@gmail.com>
Authored: Tue Mar 29 18:07:37 2016 +0300
Committer: Victor Antonovich <v....@gmail.com>
Committed: Tue Mar 29 18:07:37 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/karaf/cellar/core/discovery/Discovery.java | 1 -
.../java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/176a7f2d/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java b/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java
index ce16744..95c6040 100644
--- a/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java
+++ b/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java
@@ -19,7 +19,6 @@ package org.apache.karaf.cellar.core.discovery;
public class Discovery {
public static final String PID = "org.apache.karaf.cellar.discovery";
- public static final String MEMBERS_PROPERTY_NAME = "tcpIpMembers";
public static final String DISCOVERED_MEMBERS_PROPERTY_NAME = "discoveredMembers";
public static final String INTERVAL = "interval";
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/176a7f2d/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
index c3f0b41..b50cc6e 100644
--- a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
+++ b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
@@ -70,7 +70,7 @@ public class DiscoveryTask implements Runnable {
properties = new Hashtable();
}
String newMemberText = CellarUtils.createStringFromSet(members, true);
- String memberText = (String) properties.get(Discovery.MEMBERS_PROPERTY_NAME);
+ String memberText = (String) properties.get(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME);
if (newMemberText != null && newMemberText.length() > 0 && !newMemberText.equals(memberText)) {
properties.put(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME, newMemberText);
LOGGER.trace("CELLAR DISCOVERY: adding a new member {} to configuration and updating it", newMemberText);
[2/2] karaf-cellar git commit: Merge branch
'fix-discovered-members-property' of https://github.com/3cky/karaf-cellar
Posted by jb...@apache.org.
Merge branch 'fix-discovered-members-property' of https://github.com/3cky/karaf-cellar
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/cc877e2b
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/cc877e2b
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/cc877e2b
Branch: refs/heads/master
Commit: cc877e2b33e97eedf81ff7bb03a542e5e7de5167
Parents: dee8c42 176a7f2
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Wed Jun 22 07:51:59 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Wed Jun 22 07:51:59 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/cellar/core/discovery/Discovery.java | 1 -
.../java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------