Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61C53111CE for ; Wed, 14 May 2014 15:54:46 +0000 (UTC) Received: (qmail 84023 invoked by uid 500); 14 May 2014 14:54:46 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 83967 invoked by uid 500); 14 May 2014 14:54:45 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 83960 invoked by uid 99); 14 May 2014 14:54:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 14:54:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 74A768C434E; Wed, 14 May 2014 14:54:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/1843-feature-bigcouch to 0afec9a Date: Wed, 14 May 2014 14:54:45 +0000 (UTC) Repository: couchdb Updated Branches: refs/heads/1843-feature-bigcouch 3131cf0d2 -> 0afec9a44 rexi did not need merging Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0afec9a4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0afec9a4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0afec9a4 Branch: refs/heads/1843-feature-bigcouch Commit: 0afec9a44c96acf0dd34d99c2d9cc600f25b5401 Parents: 3131cf0 Author: Robert Newson Authored: Wed May 14 15:54:35 2014 +0100 Committer: Robert Newson Committed: Wed May 14 15:54:35 2014 +0100 ---------------------------------------------------------------------- rebar.config.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/0afec9a4/rebar.config.script ---------------------------------------------------------------------- diff --git a/rebar.config.script b/rebar.config.script index 94844fa..024bf7b 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -32,7 +32,7 @@ DepDescs = [ {mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}}, {mochiweb, "couchdb-mochiweb", {branch, "master"}}, {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}}, - {rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}}, + {rexi, "couchdb-rexi", {branch, "master"}}, {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}} ],