summaryrefslogtreecommitdiff
path: root/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
commit3c09b0a8be811f899a57d62f26ab6bde3631b87f (patch)
tree23d8fe85d2b8ca331dd35b23f19f30a30da2f821 /cpp/src
parent7777cf9b68d74dd3d90a9646e5afcfcb1a69dfe1 (diff)
downloadqpid-python-3c09b0a8be811f899a57d62f26ab6bde3631b87f.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/qpid@1449869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/ha/types.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/cpp/src/qpid/ha/types.cpp b/cpp/src/qpid/ha/types.cpp
index bb4bf83574..4010ec03a8 100644
--- a/cpp/src/qpid/ha/types.cpp
+++ b/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"
};