Merge branch 'master' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/540cd28a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/540cd28a Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/540cd28a Branch: refs/heads/persistent-watch Commit: 540cd28a33bccc6423765851631a02dcd974b89f Parents: f645190 2342578 Author: randgalt <randg...@apache.org> Authored: Wed Jan 11 21:44:46 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Wed Jan 11 21:44:46 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/curator/utils/DebugUtils.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/540cd28a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java ---------------------------------------------------------------------- diff --cc curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java index beea726,ce751ec..45eea22 --- a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java +++ b/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java @@@ -21,12 -20,10 +21,13 @@@ package org.apache.curator.utils public class DebugUtils { - public static final String PROPERTY_LOG_EVENTS = "curator-log-events"; - public static final String PROPERTY_DONT_LOG_CONNECTION_ISSUES = "curator-dont-log-connection-problems"; - public static final String PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL = "curator-log-only-first-connection-issue-as-error-level"; + public static final String PROPERTY_LOG_EVENTS = "curator-log-events"; + public static final String PROPERTY_DONT_LOG_CONNECTION_ISSUES = "curator-dont-log-connection-problems"; + public static final String PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL = "curator-log-only-first-connection-issue-as-error-level"; + public static final String PROPERTY_REMOVE_WATCHERS_IN_FOREGROUND = "curator-remove-watchers-in-foreground"; + public static final String PROPERTY_VALIDATE_NAMESPACE_WATCHER_MAP_EMPTY = "curator-validate-namespace-watcher-map-empty"; + + private DebugUtils() { }