You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/28 14:37:44 UTC
[22/23] couchdb commit: updated refs/heads/master to aa9f32d
windsor-merge complete
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/881ead7e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/881ead7e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/881ead7e
Branch: refs/heads/master
Commit: 881ead7e30f7113ab5c78d684a3b577d4fa42d0f
Parents: bf73cf4
Author: Robert Newson <rn...@apache.org>
Authored: Thu Aug 28 13:25:07 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Aug 28 13:25:07 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/881ead7e/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index f080427..3dab22f 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,32 +17,32 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
- {b64url, "b64url", {branch, "windsor-merge"}},
- {cassim, "cassim", {branch, "windsor-merge"}},
+ {b64url, "b64url", {branch, "master"}},
+ {cassim, "cassim", {branch, "master"}},
{couch_log, "couch-log", {branch, "master"}},
{config, "config", {branch, "master"}},
- {chttpd, "chttpd", {branch, "windsor-merge"}},
- {couch, "couch", {branch, "windsor-merge"}},
- {couch_index, "couch-index", {branch, "windsor-merge"}},
- {couch_mrview, "couch-mrview", {branch, "windsor-merge"}},
- {couch_replicator, "couch-replicator", {branch, "windsor-merge"}},
+ {chttpd, "chttpd", {branch, "master"}},
+ {couch, "couch", {branch, "master"}},
+ {couch_index, "couch-index", {branch, "master"}},
+ {couch_mrview, "couch-mrview", {branch, "master"}},
+ {couch_replicator, "couch-replicator", {branch, "master"}},
{couch_dbupdates, "couch-dbupdates", {branch, "master"}},
{couch_plugins, "couch-plugins", {branch, "master"}},
- {couch_event, "couch-event", {branch, "windsor-merge"}},
+ {couch_event, "couch-event", {branch, "master"}},
{couch_stats, "couch-stats", {branch, "master"}},
{docs, "documentation", {branch, "master"}, [raw]},
- {ddoc_cache, "ddoc-cache", {branch, "windsor-merge"}},
- {ets_lru, "ets-lru", {branch, "windsor-merge"}},
- {fabric, "fabric", {branch, "windsor-merge"}},
+ {ddoc_cache, "ddoc-cache", {branch, "master"}},
+ {ets_lru, "ets-lru", {branch, "master"}},
+ {fabric, "fabric", {branch, "master"}},
{fauxton, "fauxton", {branch, "master"}, [raw]},
- {global_changes, "global-changes", {branch, "windsor-merge"}},
+ {global_changes, "global-changes", {branch, "master"}},
{ibrowse, "ibrowse", {branch, "master"}},
{jiffy, "jiffy", {branch, "master"}},
- {khash, "khash", {branch, "windsor-merge"}},
- {mem3, "mem3", {branch, "windsor-merge"}},
+ {khash, "khash", {branch, "master"}},
+ {mem3, "mem3", {branch, "master"}},
{mochiweb, "mochiweb", {branch, "master"}},
{oauth, "oauth", {branch, "master"}},
- {rexi, "rexi", {branch, "windsor-merge"}},
+ {rexi, "rexi", {branch, "master"}},
{snappy, "snappy", {branch, "1994-merge-rcouch"}}
],