summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volgen.c
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-03-05 02:35:00 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-03-05 03:29:32 +0000
commitd23e33a93ccf46435e4176943da1797b7c142288 (patch)
tree1167b5c1006ec893013ddc4d761ba2c357d2f162 /xlators/mgmt/glusterd/src/glusterd-volgen.c
parent2775959b47c15e597a7974bbafa79e0882452952 (diff)
nsr: update to latest versions of etcd and etcd-api
Also fixed some general bit-rot around how daemons are started when using real etcd. Change-Id: Ib5d9c8d49982c4562b6a28b7a7c1dd1e5d9d3077 Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 86bdc754a..545b66818 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -1467,11 +1467,7 @@ add_nsr_stuff (volgen_graph_t *graph, char *volname,
char c_d[NSR_MAX_PATH_SIZE];
char *username = NULL, *password = NULL;
gf_boolean_t enable_recon = _gf_false;
-#ifdef HAVE_ETCD
- uint32_t nsr_port = 27000;
-#else
static uint32_t nsr_port = 27000;
-#endif
if (glusterd_volinfo_get_boolean(volinfo,"cluster.nsr.recon") > 0) {