summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-10-01 21:02:29 +0000
committerAlan Conway <aconway@apache.org>2009-10-01 21:02:29 +0000
commita56c148d59ed219adb0a415e2d6f281a0a819074 (patch)
tree2d57b6ff8cffa68dd86c0dc76ce4486e281121d3 /qpid/cpp/src
parentbe9dc9a64e3500097b5e9470e2c412d61c5a4cb4 (diff)
downloadqpid-python-a56c148d59ed219adb0a415e2d6f281a0a819074.tar.gz
Set cluster version number from SVN revision.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@820788 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/cluster/Cluster.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp
index e35d3e4175..60d580d6c7 100644
--- a/qpid/cpp/src/qpid/cluster/Cluster.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp
@@ -144,12 +144,16 @@ using qpid::management::Manageable;
using qpid::management::Args;
namespace _qmf = ::qmf::org::apache::qpid::cluster;
-/** NOTE: increment this number whenever any incompatible changes in
+/**
+ * NOTE: must increment this number whenever any incompatible changes in
* cluster protocol/behavior are made. It allows early detection and
* sensible reporting of an attempt to mix different versions in a
* cluster.
+ *
+ * Currently use SVN revision to avoid clashes with versions from
+ * different branches.
*/
-const uint32_t Cluster::CLUSTER_VERSION = 2;
+const uint32_t Cluster::CLUSTER_VERSION = 820783;
struct ClusterDispatcher : public framing::AMQP_AllOperations::ClusterHandler {
qpid::cluster::Cluster& cluster;