Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B824C1073A for ; Mon, 7 Oct 2013 16:37:43 +0000 (UTC) Received: (qmail 69695 invoked by uid 500); 7 Oct 2013 16:37:43 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 69344 invoked by uid 500); 7 Oct 2013 16:37:42 -0000 Mailing-List: contact dev-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 dev@couchdb.apache.org Received: (qmail 69328 invoked by uid 99); 7 Oct 2013 16:37:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 16:37:41 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy includes SPF record at spf.trusted-forwarder.org) Received: from [80.244.253.218] (HELO mail.traeumt.net) (80.244.253.218) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 16:37:36 +0000 Received: from [10.0.0.11] (91-66-82-235-dynip.superkabel.de [91.66.82.235]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.traeumt.net (Postfix) with ESMTPSA id 880BE1417C; Mon, 7 Oct 2013 18:40:25 +0200 (CEST) From: Jan Lehnardt Content-Type: multipart/signed; boundary="Apple-Mail=_A9EF03DE-B007-4202-ABFD-E4BA43E349FD"; protocol="application/pgp-signature"; micalg=pgp-sha512 Message-Id: <2D2D51D8-181C-4677-9097-1B053069D4AF@apache.org> Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) Subject: Re: git commit: updated refs/heads/master to 2e081e0 Date: Mon, 7 Oct 2013 18:37:14 +0200 References: To: "dev@couchdb.apache.org Developers" , Dave Cottlehuber In-Reply-To: X-Mailer: Apple Mail (2.1508) X-Virus-Checked: Checked by ClamAV on apache.org --Apple-Mail=_A9EF03DE-B007-4202-ABFD-E4BA43E349FD Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Dave, should this go into 1.5.x? On Oct 7, 2013, at 00:49 , dch@apache.org wrote: > Updated Branches: > refs/heads/master fba51dbd2 -> 2e081e095 > > > snappy: ensure configure.ac matches snappy release > > See history in COUCHDB-1600 for full patch > > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo > Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2e081e09 > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2e081e09 > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2e081e09 > > Branch: refs/heads/master > Commit: 2e081e095192e18b5bc6cac154a8add17205b87a > Parents: fba51db > Author: Dave Cottlehuber > Authored: Mon Oct 7 00:47:58 2013 +0200 > Committer: Dave Cottlehuber > Committed: Mon Oct 7 00:49:08 2013 +0200 > > ---------------------------------------------------------------------- > configure.ac | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/2e081e09/configure.ac > ---------------------------------------------------------------------- > diff --git a/configure.ac b/configure.ac > index a5c7f86..7ab4e66 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -40,7 +40,7 @@ PKG_PROG_PKG_CONFIG > dnl Config for google snappy > m4_define([snappy_major], [1]) > m4_define([snappy_minor], [0]) > -m4_define([snappy_patchlevel], [3]) > +m4_define([snappy_patchlevel], [5]) > > AC_PROG_CXX > AC_LANG([C++]) > --Apple-Mail=_A9EF03DE-B007-4202-ABFD-E4BA43E349FD Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJSUuM6AAoJENnuAeR4Uq7kqogP/RwS8d0BrdH+zfuJTK/Xi6Fa A25yni8uaYL2c3T/TkVXWzyOqwngcNAmgaxxBxTZfXceko+4CmwKaA7wx65NL0qA wdKFJGyxj7ZBrPEeAicGUosi1wNPI/+GZ1QzDmn4+V0ynDadjDCHZ67Wek452awM Fk2evDIlFyEHbqLqqTH8t549F58JsM+9iNXJdwAz1VLGWlLspbks25vxk7JtBrFq epA4D/KKWKj+mXbBM1w5a39pUfG5jxcu/9FQJZew0TCM4oiyXzqikqTXTQj0yIYe jUhWD2RIv+sGVQXzHJ8nI73112I3xsSsCE/PlO0qw9pEBY79CLtgI7eJKqgd2IXC 1UI+axVfoYILaFGbaxzZOq3YX+qnFTplzPi8w1rKYm7pbNVEJmF++qb2R3oLE278 8QMYaenkclbPorctGMpeF680JcIYjqzjqqB6mdXnmz4BZwGCruloGTyI3poeoIKB zThyD4Xv13zMn08hah62n/VxHBAjlsV5soUUj2qgDXAOJe9Hw43UoMTKrKt/KFlM SXzs7UhR23FawZA31qI2J8huwwbocWFbrASQC4Tz1Rx9gRKgdixz/cLZW9Puv4Q+ GP2rWrxsVI5TM9c/5slZT1sYsViUbxw2L9LqWYtf8Wqa+ogCnDxUhUTtJ046BDtU ClebWILzvpn4niIYxkWH =HQtc -----END PGP SIGNATURE----- --Apple-Mail=_A9EF03DE-B007-4202-ABFD-E4BA43E349FD--