Permalink
Browse files

Pull in Alk's changes to interleave rebalance and compaction.

Refer to my remote instead of unmerged changeset.

Change-Id: If40a6297808962a7c0b0a8ce3bb1453c876dea56
Reviewed-on: http://review.couchbase.org/22233
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>
  • Loading branch information...
1 parent 36c7cb0 commit 20c2e4aab8419e875df8d16e0cb3960461d9be30 @melkote melkote committed with steveyen Nov 2, 2012
Showing with 1 addition and 3 deletions.
  1. +1 −3 toy/toy-siri.xml
View
@@ -19,7 +19,7 @@
<project name="membase-cli" path="membase-cli" remote="membase" />
<project name="memcached" path="memcached" remote="membase"/>
<project name="moxi" path="moxi"/>
- <project name="ns_server" path="ns_server" />
+ <project name="ns_server" path="ns_server" remote="melkote"/>
<project name="portsigar" path="portsigar" />
<project name="sigar" path="sigar" revision="master" />
<project path="couchbase-examples" name="couchbase-examples" />
@@ -31,6 +31,4 @@
<project path="mccouch" name="mccouch" />
<project path="testrunner" name="testrunner" />
- <project path="otp" name="otp" remote="erlang" revision="refs/tags/OTP_R14B04" />
-
</manifest>

0 comments on commit 20c2e4a

Please sign in to comment.