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 E3AC3CCB0 for ; Fri, 28 Nov 2014 21:00:11 +0000 (UTC) Received: (qmail 99353 invoked by uid 500); 28 Nov 2014 21:00:05 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 99269 invoked by uid 500); 28 Nov 2014 21:00:05 -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 97959 invoked by uid 99); 28 Nov 2014 21:00:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Nov 2014 21:00:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B6ABF8B69BE; Fri, 28 Nov 2014 21:00:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Fri, 28 Nov 2014 21:00:45 -0000 Message-Id: <24f22738a13f4f9b8e0f352e4f4129a0@git.apache.org> In-Reply-To: <73dbd4c3aedd405d98e87fed3b3c1cb9@git.apache.org> References: <73dbd4c3aedd405d98e87fed3b3c1cb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/47] couchdb commit: updated refs/heads/enable-csp-default to dbd38a1 Switch couchdb-snappy to master branch Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a79b07b4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a79b07b4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a79b07b4 Branch: refs/heads/enable-csp-default Commit: a79b07b4a487b90aae1fcdf58e3f6c56d86c8e7b Parents: 390e922 Author: Alexander Shorin Authored: Thu Nov 20 21:28:06 2014 +0300 Committer: Alexander Shorin Committed: Thu Nov 20 21:28:06 2014 +0300 ---------------------------------------------------------------------- rebar.config.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/a79b07b4/rebar.config.script ---------------------------------------------------------------------- diff --git a/rebar.config.script b/rebar.config.script index d8e025f..4bc824f 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -46,7 +46,7 @@ DepDescs = [ {mochiweb, "mochiweb", {branch, "master"}}, {oauth, "oauth", {branch, "master"}}, {rexi, "rexi", {branch, "master"}}, - {snappy, "snappy", {branch, "1994-merge-rcouch"}} + {snappy, "snappy", {branch, "master"}} ], BaseUrl = "https://git-wip-us.apache.org/repos/asf/",