25 files changed, 9 insertions, 159 deletions
diff --git a/Makefile.am b/Makefile.am
index 85054dcab38..eba8ed12da6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = autogen.sh \
 	gen-headers.py
 
 SUBDIRS = argp-standalone libglusterfs rpc api xlators glusterfsd \
-	$(FUSERMOUNT_SUBDIR) doc extras cli
+	$(FUSERMOUNT_SUBDIR) doc extras cli @SYNCDAEMON_SUBDIR@
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = glusterfs-api.pc libgfchangelog.pc
@@ -20,7 +20,9 @@ gitclean: distclean
 	rm -fr autom4te.cache
 	rm -f missing aclocal.m4 config.h.in config.guess config.sub ltmain.sh install-sh configure depcomp
 	rm -fr argp-standalone/autom4te.cache
-	rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in argp-standalone/configure argp-standalone/depcomp argp-standalone/install-sh argp-standalone/missing
+	rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in
+	rm -f argp-standalone/configure argp-standalone/depcomp
+	rm -f argp-standalone/install-sh argp-standalone/missing
 
 dist-hook:
 	(cd $(srcdir) && git diff && echo ===== git log ==== && git log) > $(distdir)/ChangeLog
diff --git a/configure.ac b/configure.ac
index c9a816d768c..cfccf3f9e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,9 +107,6 @@ AC_CONFIG_FILES([Makefile
                 xlators/features/quota/src/Makefile
                 xlators/features/marker/Makefile
                 xlators/features/marker/src/Makefile
-                xlators/features/marker/utils/Makefile
-                xlators/features/marker/utils/src/Makefile
-                xlators/features/marker/utils/syncdaemon/Makefile
                 xlators/features/read-only/Makefile
                 xlators/features/read-only/src/Makefile
                 xlators/features/mac-compat/Makefile
@@ -158,6 +155,9 @@ AC_CONFIG_FILES([Makefile
                 libgfchangelog.pc
                 api/Makefile
                 api/src/Makefile
+		geo-replication/Makefile
+		geo-replication/src/Makefile
+		geo-replication/syncdaemon/Makefile
                 glusterfs.spec])
 
 AC_CANONICAL_HOST
@@ -422,7 +422,7 @@ case $host_os in
 esac
 SYNCDAEMON_COMPILE=0
 if test "x$enable_georeplication" != "xno"; then
-  SYNCDAEMON_SUBDIR=utils
+  SYNCDAEMON_SUBDIR=geo-replication
   SYNCDAEMON_COMPILE=1
 
   BUILD_SYNCDAEMON="yes"
diff --git a/xlators/features/marker/utils/Makefile.am b/geo-replication/Makefile.am
index 556951d9fb7..556951d9fb7 100644
--- a/xlators/features/marker/utils/Makefile.am
+++ b/geo-replication/Makefile.am
diff --git a/xlators/features/marker/utils/src/Makefile.am b/geo-replication/src/Makefile.am
index 9e410cda633..9e410cda633 100644
--- a/xlators/features/marker/utils/src/Makefile.am
+++ b/geo-replication/src/Makefile.am
diff --git a/xlators/features/marker/utils/src/gsyncd.c b/geo-replication/src/gsyncd.c
index 9c4a5bdffb3..9c4a5bdffb3 100644
--- a/xlators/features/marker/utils/src/gsyncd.c
+++ b/geo-replication/src/gsyncd.c
diff --git a/xlators/features/marker/utils/src/procdiggy.c b/geo-replication/src/procdiggy.c
index 1eba414c116..1eba414c116 100644
--- a/xlators/features/marker/utils/src/procdiggy.c
+++ b/geo-replication/src/procdiggy.c
diff --git a/xlators/features/marker/utils/src/procdiggy.h b/geo-replication/src/procdiggy.h
index 56dfc4eb213..56dfc4eb213 100644
--- a/xlators/features/marker/utils/src/procdiggy.h
+++ b/geo-replication/src/procdiggy.h
diff --git a/xlators/features/marker/utils/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am
index c19f6b45919..c19f6b45919 100644
--- a/xlators/features/marker/utils/syncdaemon/Makefile.am
+++ b/geo-replication/syncdaemon/Makefile.am
diff --git a/xlators/features/marker/utils/syncdaemon/README.md b/geo-replication/syncdaemon/README.md
index d45006932d1..d45006932d1 100644
--- a/xlators/features/marker/utils/syncdaemon/README.md
+++ b/geo-replication/syncdaemon/README.md
diff --git a/xlators/features/marker/utils/syncdaemon/__codecheck.py b/geo-replication/syncdaemon/__codecheck.py
index e3386afba8b..e3386afba8b 100644
--- a/xlators/features/marker/utils/syncdaemon/__codecheck.py
+++ b/geo-replication/syncdaemon/__codecheck.py
diff --git a/xlators/features/marker/utils/syncdaemon/__init__.py b/geo-replication/syncdaemon/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/xlators/features/marker/utils/syncdaemon/__init__.py
+++ b/geo-replication/syncdaemon/__init__.py
diff --git a/xlators/features/marker/utils/syncdaemon/configinterface.py b/geo-replication/syncdaemon/configinterface.py
index e55bec519e9..e55bec519e9 100644
--- a/xlators/features/marker/utils/syncdaemon/configinterface.py
+++ b/geo-replication/syncdaemon/configinterface.py
diff --git a/xlators/features/marker/utils/syncdaemon/gconf.py b/geo-replication/syncdaemon/gconf.py
index 146c72a1825..146c72a1825 100644
--- a/xlators/features/marker/utils/syncdaemon/gconf.py
+++ b/geo-replication/syncdaemon/gconf.py
diff --git a/xlators/features/marker/utils/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py
index 387900e6ce8..387900e6ce8 100644
--- a/xlators/features/marker/utils/syncdaemon/gsyncd.py
+++ b/geo-replication/syncdaemon/gsyncd.py
diff --git a/xlators/features/marker/utils/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py
index f0a9d22920a..f0a9d22920a 100644
--- a/xlators/features/marker/utils/syncdaemon/libcxattr.py
+++ b/geo-replication/syncdaemon/libcxattr.py
diff --git a/xlators/features/marker/utils/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index f903f30595d..f903f30595d 100644
--- a/xlators/features/marker/utils/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
diff --git a/xlators/features/marker/utils/syncdaemon/monitor.py b/geo-replication/syncdaemon/monitor.py
index b8956dcc2b9..b8956dcc2b9 100644
--- a/xlators/features/marker/utils/syncdaemon/monitor.py
+++ b/geo-replication/syncdaemon/monitor.py
diff --git a/xlators/features/marker/utils/syncdaemon/repce.py b/geo-replication/syncdaemon/repce.py
index 755fb61df48..755fb61df48 100644
--- a/xlators/features/marker/utils/syncdaemon/repce.py
+++ b/geo-replication/syncdaemon/repce.py
diff --git a/xlators/features/marker/utils/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index 73102fbcb44..73102fbcb44 100644
--- a/xlators/features/marker/utils/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
diff --git a/xlators/features/marker/utils/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
index 0764c07904d..0764c07904d 100644
--- a/xlators/features/marker/utils/syncdaemon/syncdutils.py
+++ b/geo-replication/syncdaemon/syncdutils.py
diff --git a/tests/bugs/bug-861945.t b/tests/bugs/bug-861945.t
deleted file mode 100755
index 29ccb33c8b1..00000000000
--- a/tests/bugs/bug-861945.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-function georep_start_and_check()
-{
-    local master=$1
-    local slave=$2
-
-    $CLI volume geo-replication $master $slave start
-}
-
-function georep_stop()
-{
-    local master=$1
-    local slave=$2
-
-    $CLI volume geo-replication $master $slave stop
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0 $H0:$B0/brick1
-TEST $CLI volume start $V0
-
-sleep 5
-
-slave=`mktemp -d`
-mkdir -p $slave
-
-# check normal functionality of geo-replication
-EXPECT_KEYWORD "successful" georep_start_and_check $V0 $slave
-TEST georep_stop $V0 $slave
-
-# now invoke replace brick
-TEST $CLI volume replace-brick $V0 $H0:$B0/brick1 $H0:$B0/brick2 start
-
-# check if CLI refuses to start geo replication
-EXPECT_KEYWORD "failed" georep_start_and_check $V0 $slave
-
-# commit replace brick operation
-TEST $CLI volume replace-brick $V0 $H0:$B0/brick1 $H0:$B0/brick2 commit
-
-# geo replication should work as usual
-EXPECT_KEYWORD "successful" georep_start_and_check $V0 $slave
-TEST georep_stop $V0 $slave
-
-rm -rf $slave
-cleanup
diff --git a/tests/bugs/bug-864499.t b/tests/bugs/bug-864499.t
deleted file mode 100644
index 03c7bbe136f..00000000000
--- a/tests/bugs/bug-864499.t
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0
-TEST $CLI volume start $V0
-
-TEST "$CLI volume geo-replication $V0 $B0/slave start --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave stop --xml | xmllint --format -"
-
-TEST $CLI volume stop $V0
-
-cleanup;
-
diff --git a/tests/bugs/bug-864506.t b/tests/bugs/bug-864506.t
deleted file mode 100755
index c281f381124..00000000000
--- a/tests/bugs/bug-864506.t
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0
-TEST $CLI volume start $V0
-
-TEST "mkdir $B0/slave"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave start --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave2 start --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication status --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave status --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave2 status --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave stop --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave2 stop --xml | xmllint --format -"
-
-TEST $CLI volume stop $V0
-
-TEST "rmdir $B0/slave"
-
-cleanup;
diff --git a/tests/bugs/bug-874272.t b/tests/bugs/bug-874272.t
deleted file mode 100755
index 01793a36873..00000000000
--- a/tests/bugs/bug-874272.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Wait for volume to register with rpc.mountd
-sleep 5;
-
-#mount on a random dir
-TEST MOUNTDIR="/tmp/$RANDOM"
-TEST mkdir $MOUNTDIR
-TEST  mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $MOUNTDIR;
-flag=0
-
-TEST touch $MOUNTDIR/testfile
-
-TEST GEOREPDIR="/tmp/$RANDOM"
-TEST mkdir $GEOREPDIR
-
-TEST $CLI volume geo-replication $V0 file:///$GEOREPDIR start
-
-for i in {1..500}; do cat /etc/passwd >> $MOUNTDIR/testfile; if [ $? -ne 0 ]; then flag=1; break; fi; done
-TEST [ $flag -eq 0 ]
-TEST rm -rf $GEOREPDIR
-
-TEST   umount $MOUNTDIR
-TEST   rm -rf $MOUNTDIR
-
-cleanup;
diff --git a/xlators/features/marker/Makefile.am b/xlators/features/marker/Makefile.am
index a6ba2de16ae..a985f42a877 100644
--- a/xlators/features/marker/Makefile.am
+++ b/xlators/features/marker/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = src @SYNCDAEMON_SUBDIR@
+SUBDIRS = src
 
 CLEANFILES =