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:55 UTC
[22/50] couchdb commit: updated refs/heads/master to 6526051
oauth is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c5da4ba9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c5da4ba9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c5da4ba9
Branch: refs/heads/master
Commit: c5da4ba92da061321c6ab34ef3c895928b614be3
Parents: 7bd5a76
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 16:40:17 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 16:40:17 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c5da4ba9/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index b3f29ae..33c451b 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -31,7 +31,7 @@ DepDescs = [
{jiffy, "couchdb-jiffy", {branch, "master"}},
{mem3, "couchdb-mem3", {branch, "master"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
- {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
+ {oauth, "couchdb-oauth", {branch, "master"}},
{rexi, "couchdb-rexi", {branch, "master"}},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
],