diff options
| author | Robert Newson <rnewson@apache.org> | 2014-08-28 13:25:07 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2014-08-28 13:25:07 +0100 |
| commit | 881ead7e30f7113ab5c78d684a3b577d4fa42d0f (patch) | |
| tree | bacd876c6bf1a9ee0f3dcd4da3eed8f7c308aee9 | |
| parent | bf73cf4b19b2c9c82df3b487f04557a262378236 (diff) | |
| download | couchdb-881ead7e30f7113ab5c78d684a3b577d4fa42d0f.tar.gz | |
windsor-merge complete
| -rw-r--r-- | rebar.config.script | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/rebar.config.script b/rebar.config.script index f080427d3..3dab22f24 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"}} ], |