diff options
| author | Adam Kocoloski <adam.kocoloski@gmail.com> | 2011-01-20 12:43:37 -0500 |
|---|---|---|
| committer | Adam Kocoloski <adam.kocoloski@gmail.com> | 2011-01-20 13:05:41 -0500 |
| commit | f79d0a666a5fb9541a0925db5111208a94631065 (patch) | |
| tree | 392d85a8a9887ddc8f6268a48a65537b21734a7d /rebar.config | |
| parent | 2ea18bdaa19ea7f2da1a5dccce65d50cf0efc64d (diff) | |
| parent | 94286611038e661487382ed834103853e88fdf69 (diff) | |
Merge CouchDB 1.0.2 release candidate
Conflicts:
Makefile.am
acinclude.m4.in
apps/couch/src/couch_db.erl
apps/couch/src/couch_db_updater.erl
apps/couch/src/couch_rep.erl
apps/couch/src/couch_rep_reader.erl
apps/couch/src/couch_view.erl
apps/couch/src/couch_view_group.erl
rel/overlay/etc/default.ini
share/Makefile.am
src/couchdb/couch_query_servers.erl
src/ibrowse/Makefile.am
src/ibrowse/ibrowse.app.in
src/ibrowse/ibrowse.erl
src/ibrowse/ibrowse_app.erl
src/ibrowse/ibrowse_http_client.erl
src/ibrowse/ibrowse_lb.erl
src/ibrowse/ibrowse_lib.erl
src/ibrowse/ibrowse_sup.erl
src/ibrowse/ibrowse_test.erl
src/mochiweb/mochijson2.erl
test/etap/112-replication-missing-revs.t
test/etap/113-replication-attachment-comp.t
test/etap/140-attachment-comp.t
Diffstat (limited to 'rebar.config')
| -rw-r--r-- | rebar.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rebar.config b/rebar.config index bcbc117b..b621564a 100644 --- a/rebar.config +++ b/rebar.config @@ -16,9 +16,9 @@ {oauth, ".*", {git, "git://github.com/cloudant/erlang-oauth.git", {tag, "CouchDB-1.0.1-rebar"}}}, {ibrowse, ".*", {git, "git://github.com/cloudant/ibrowse.git", {branch, + "couch2"}}}, + {mochiweb, ".*", {git, "git://github.com/cloudant/mochiweb.git", {branch, "couch"}}}, - {mochiweb, ".*", {git, "git://github.com/cloudant/mochiweb.git", {tag, - "CouchDB-1.0.1-rebar"}}}, {rexi, ".*", {git, "git://github.com/cloudant/rexi.git", "master"}}, {fabric, ".*", {git, "git://github.com/cloudant/fabric.git", "master"}}, {mem3, ".*", {git, "git://github.com/cloudant/mem3.git", "master"}}, |