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/07/10 16:50:39 UTC

[06/50] couchdb commit: updated refs/heads/master to 6526051

mochiweb is merged


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c278eb13
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c278eb13
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c278eb13

Branch: refs/heads/master
Commit: c278eb132d38d809843e33a91675407b7ac9c45f
Parents: 00044b6
Author: Robert Newson <rn...@apache.org>
Authored: Fri Apr 25 13:17:34 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Apr 25 13:17:34 2014 +0100

----------------------------------------------------------------------
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c278eb13/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 2bef945..cf77652 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
     {ibrowse, "couchdb-ibrowse", {branch,  "master"}},
     {jiffy, "couchdb-jiffy", {branch, "1843-feature-bigcouch"}},
     {mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
-    {mochiweb, "couchdb-mochiweb", {branch, "1843-feature-bigcouch"}},
+    {mochiweb, "couchdb-mochiweb", {branch, "master"}},
     {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
     {rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}},
     {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}