You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/08/07 20:34:26 UTC
couchdb commit: updated refs/heads/windsor-merge to b667060
Repository: couchdb
Updated Branches:
refs/heads/windsor-merge 68db49da0 -> b667060b6
Use the windsor-merge branch of couch_index
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b667060b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b667060b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b667060b
Branch: refs/heads/windsor-merge
Commit: b667060b6de78f8c20e450e1e39d767c096ad88d
Parents: 68db49d
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Aug 7 13:34:15 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Aug 7 13:34:15 2014 -0500
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b667060b/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 158d9e4..456df6e 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,7 +23,7 @@ DepDescs = [
{config, "config", {branch, "master"}},
{chttpd, "chttpd", {branch, "windsor-merge"}},
{couch, "couch", {branch, "windsor-merge"}},
- {couch_index, "couch-index", {branch, "master"}},
+ {couch_index, "couch-index", {branch, "windsor-merge"}},
{couch_mrview, "couch-mrview", {branch, "windsor-merge"}},
{couch_replicator, "couch-replicator", {branch, "windsor-merge"}},
{couch_dbupdates, "couch-dbupdates", {branch, "master"}},