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 2015/09/14 14:56:03 UTC
karaf-cellar git commit: Fix groups.cfg file and OBR log messages
Repository: karaf-cellar
Updated Branches:
refs/heads/master bfebb16e2 -> 13fa2b438
Fix groups.cfg file and OBR log messages
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/13fa2b43
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/13fa2b43
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/13fa2b43
Branch: refs/heads/master
Commit: 13fa2b43874e63c641fc37b22e99f995b201c2c0
Parents: bfebb16
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Sep 14 14:55:43 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Sep 14 14:55:43 2015 +0200
----------------------------------------------------------------------
assembly/src/main/resources/groups.cfg | 2 +-
.../java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java | 2 +-
.../main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/13fa2b43/assembly/src/main/resources/groups.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/groups.cfg b/assembly/src/main/resources/groups.cfg
index bd64cd6..a476ef0 100644
--- a/assembly/src/main/resources/groups.cfg
+++ b/assembly/src/main/resources/groups.cfg
@@ -43,7 +43,7 @@ default.feature.blacklist.outbound = none
# cluster: the synchronizer retrieves the state from the cluster group first (pull first), and push the node the state
# to the cluster group after (push after)
# node: the synchronizer push the node state to the cluster group (push first), and pull the state from the cluster group
- after (pull after)
+# after (pull after)
# clusterOnly: the cluster is the "master", the node only retrieves and applies the cluster group state, nothing is
# pushed to the cluster group
# nodeOnly: the node is the "master", the node pushes his state to the cluster group, nothing is pulled from the
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/13fa2b43/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
----------------------------------------------------------------------
diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
index 9e3eff3..02cbf1a 100644
--- a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
+++ b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
@@ -133,7 +133,7 @@ public class ObrBundleEventHandler extends ObrSupport implements EventHandler<Cl
// check if it's not a "local" event
if (event.getSourceNode() != null && event.getSourceNode().getId().equalsIgnoreCase(clusterManager.getNode().getId())) {
- LOGGER.trace("CELLAR BUNDLE: cluster event is local (coming from local synchronizer or listener)");
+ LOGGER.trace("CELLAR OBR: cluster event is local (coming from local synchronizer or listener)");
return;
}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/13fa2b43/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
----------------------------------------------------------------------
diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
index 9c3078c..6f435aa 100644
--- a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
+++ b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
@@ -72,7 +72,7 @@ public class ObrUrlEventHandler extends ObrSupport implements EventHandler<Clust
// check if it's not a "local" event
if (event.getSourceNode() != null && event.getSourceNode().getId().equalsIgnoreCase(clusterManager.getNode().getId())) {
- LOGGER.trace("CELLAR BUNDLE: cluster event is local (coming from local synchronizer or listener)");
+ LOGGER.trace("CELLAR OBR: cluster event is local (coming from local synchronizer or listener)");
return;
}