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:43 UTC
[10/50] couchdb commit: updated refs/heads/master to 6526051
jiffy did not need merge effort
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f448e2bf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f448e2bf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f448e2bf
Branch: refs/heads/master
Commit: f448e2bf9bc73c3a485e5e113b53e5ea82e63a85
Parents: 1b9158f
Author: Robert Newson <rn...@apache.org>
Authored: Thu May 1 16:02:56 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu May 1 16:02:56 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f448e2bf/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 198dae0..83e7521 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -28,7 +28,7 @@ DepDescs = [
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
{fabric, "couchdb-fabric", {branch, "1843-feature-bigcouch"}},
{ibrowse, "couchdb-ibrowse", {branch, "master"}},
- {jiffy, "couchdb-jiffy", {branch, "1843-feature-bigcouch"}},
+ {jiffy, "couchdb-jiffy", {branch, "master"}},
{mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
{oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},