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/06/09 13:51:51 UTC
couchdb commit: updated refs/heads/1843-feature-bigcouch to 6c66f61
Repository: couchdb
Updated Branches:
refs/heads/1843-feature-bigcouch c82065f56 -> 6c66f61ba
Fauxton did not require a merge
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6c66f61b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6c66f61b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6c66f61b
Branch: refs/heads/1843-feature-bigcouch
Commit: 6c66f61ba4a92cd3b7ffcb0a4319f94531cbb5aa
Parents: c82065f
Author: Robert Newson <rn...@apache.org>
Authored: Mon Jun 9 12:51:42 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Jun 9 12:51:42 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c66f61b/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 9b4fa05..68ae610 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{oauth, "couchdb-oauth", {branch, "master"}, []},
{rexi, "couchdb-rexi", {branch, "master"}, []},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}, []},
- {fauxton, "couchdb-fauxton", {branch, "import-master"}, [raw]}
+ {fauxton, "couchdb-fauxton", {branch, "master"}, [raw]}
],
MakeDep = fun({AppName, RepoName, Version, Options}) ->