summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2013-02-25 20:08:05 +0000
committerAlan Conway <aconway@apache.org>2013-02-25 20:08:05 +0000
commit242d8406759d1a2c20901c8ca083b7bb732d75d5 (patch)
tree0c67a443f4ea7a328ce5332cc70e84714b461c02 /qpid/cpp/src
parent6638cf0898c9680a44eb8d4d10c0b64d61b12fe0 (diff)
downloadqpid-python-242d8406759d1a2c20901c8ca083b7bb732d75d5.tar.gz
Revert "Bug 891689 - New HA regularly shutting down active node"
This reverts commit r1449832, the commit comment did not include a QPID JIRA number. A corrected version of the commit follows... git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1449869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/ha/types.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/qpid/cpp/src/qpid/ha/types.cpp b/qpid/cpp/src/qpid/ha/types.cpp
index bb4bf83574..4010ec03a8 100644
--- a/qpid/cpp/src/qpid/ha/types.cpp
+++ b/qpid/cpp/src/qpid/ha/types.cpp
@@ -56,11 +56,6 @@ template <> const char* Enum<ReplicateLevel>::NAMES[] = { "none", "configuration
template <> const size_t Enum<ReplicateLevel>::N = 3;
template <> const char* Enum<BrokerStatus>::NAME = "HA broker status";
-
-// NOTE: Changing status names will have an impact on qpid-ha and
-// the qpidd-primary init script.
-// Don't change them unless you are going to update all dependent code.
-//
template <> const char* Enum<BrokerStatus>::NAMES[] = {
"joining", "catchup", "ready", "recovering", "active", "standalone"
};