summaryrefslogtreecommitdiff
path: root/rebar.config
diff options
context:
space:
mode:
authorRobert Newson <robert.newson@cloudant.com>2011-06-13 14:59:55 +0100
committerRobert Newson <robert.newson@cloudant.com>2011-06-13 14:59:55 +0100
commite9a5a6f90a021db1db8a7e55ec797a4c86edcad6 (patch)
tree06d0c28969cfcf54b2f137e7407b097f73aa0f21 /rebar.config
parent266ba88ac6ded40087e0211ad9e75e4ce64e66cb (diff)
parent3c1a0d7e2c9adef4f8b20c9df205a86e5c0feefb (diff)
Merge CouchDB 1.1
Diffstat (limited to 'rebar.config')
-rw-r--r--rebar.config8
1 files changed, 4 insertions, 4 deletions
diff --git a/rebar.config b/rebar.config
index 8aa55d7e..332ca15f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -16,17 +16,17 @@
{oauth, ".*", {git, "https://github.com/cloudant/erlang-oauth.git",
{branch, "couch"}}},
{ibrowse, ".*", {git, "https://github.com/cloudant/ibrowse.git",
- {branch, "couch2"}}},
+ {branch, "couch_1.1"}}},
{mochiweb, ".*", {git, "https://github.com/cloudant/mochiweb.git",
- {branch, "couch"}}},
+ {branch, "couch_1.1"}}},
{rexi, ".*", {git, "https://github.com/cloudant/rexi.git",
master}},
{fabric, ".*", {git, "https://github.com/cloudant/fabric.git",
master}},
{mem3, ".*", {git, "https://github.com/cloudant/mem3.git",
- master}},
+ {branch, "couch_1.1"}}},
{chttpd, ".*", {git, "https://github.com/cloudant/chttpd.git",
- master}}
+ {branch, "couch_1.1"}}}
]}.
% needed for a clean transition to the deps model
{clean_files, [