You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/10/12 17:58:12 UTC
[48/50] [abbrv] oodt git commit: Fix merge conflict.
Fix merge conflict.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/444a5a99
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/444a5a99
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/444a5a99
Branch: refs/heads/master
Commit: 444a5a9976a041e18d60a5573bec15829a054469
Parents: d444f6c b52f235
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Thu Oct 12 10:19:50 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Thu Oct 12 10:19:50 2017 -0700
----------------------------------------------------------------------
.../config/distributed/DistributedConfigurationManager.java | 6 +++++-
.../org/apache/oodt/config/distributed/utils/ConfigUtils.java | 1 +
.../src/test/resources/distributed/config/config-publisher.xml | 1 -
workflow/pom.xml | 3 +--
.../oodt/cas/workflow/system/AvroRpcWorkflowManager.java | 3 +--
workflow/src/test/resources/workflow.properties | 0
6 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/444a5a99/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
----------------------------------------------------------------------
diff --cc config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
index fe36a02,d93c421..9f5ca85
--- a/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
+++ b/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
@@@ -42,8 -42,7 +42,9 @@@ import java.util.concurrent.TimeUnit
import static org.apache.oodt.config.Constants.Properties.ZK_CONNECT_STRING;
import static org.apache.oodt.config.Constants.Properties.ZK_PROPERTIES_FILE;
import static org.apache.oodt.config.Constants.Properties.ZK_STARTUP_TIMEOUT;
+import static org.apache.oodt.config.distributed.utils.ConfigUtils.getOODTProjectName;
+
+
/**
* Distributed configuration manager implementation. This class make use of a {@link CuratorFramework} instance to
* connect to zookeeper.