summaryrefslogtreecommitdiff
path: root/rebar.config
diff options
context:
space:
mode:
authorAdam Kocoloski <adam@cloudant.com>2011-08-15 15:45:15 -0400
committerAdam Kocoloski <adam@cloudant.com>2011-08-15 15:45:15 -0400
commit6ffe1675dd7b004e48891956a6bdbe32899ce80c (patch)
tree57326d9a498481e65bb0db38c66daf10896801f1 /rebar.config
parent52ff89ff7996e839b9e2f91fd76184d362a8aeb0 (diff)
parentfdd1a5d0bc48b49b0df5c9217beff9574011283c (diff)
Merge branch '11554-merge-couchdb-1.1'
Diffstat (limited to 'rebar.config')
-rw-r--r--rebar.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/rebar.config b/rebar.config
index 8aa55d7e..6fb5113f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -16,9 +16,9 @@
{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",