Use ns_server/master instead of voltron-support

Change-Id: If45258f2f0183f9bb7585459dd573961bdd8ba29
Reviewed-on: http://review.membase.org/5348
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>

default.xml

@@ -19,19 +19,22 @@
   <project path="bucket_engine" name="bucket_engine" />
   <project path="memcached" name="memcached"
            revision="engine" />
-  <project path="libmemcached" name="libmemcached" revision="stable" />
+
+  <project path="libmemcached" name="libmemcached"
+           revision="stable" />
   <project path="libconflate" name="libconflate" />
   <project path="libvbucket" name="libvbucket" />
+
+  <project path="moxi" name="moxi" />
   <project path="membase-cli" name="membase-cli" />
   <project path="memcachetest" name="memcachetest" />
-  <project path="moxi" name="moxi" />
   <project path="vbucketmigrator" name="vbucketmigrator" />
 
+  <project path="sigar" name="sigar" remote="couchbase" />
+  <project path="portsigar" name="portsigar" remote="couchbase" />
+
   <project path="couchdb" name="couchdb" remote="couchbase"
            revision="refs/tags/couchbase_1.1.1" />
   <project path="geocouch" name="geocouch" remote="couchbase"
            revision="refs/tags/couchbase_1.1_geo" />
-
-  <project path="sigar" name="sigar" remote="couchbase" />
-  <project path="portsigar" name="portsigar" remote="couchbase" />
 </manifest>

override.xml

@@ -15,7 +15,4 @@
            revision="refs/tags/OTP_R14B02" />
   <project path="icu4c" name="icu4c" remote="couchbase" />
   <project path="spidermonkey" name="spidermonkey" remote="couchbase" />
-
-  <project path="ns_server" name="ns_server" remote="membase" revision="voltron-support" />
-
 </manifest>