Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 A1FEE182B7 for ; Wed, 22 Jul 2015 08:08:53 +0000 (UTC) Received: (qmail 40184 invoked by uid 500); 22 Jul 2015 08:07:55 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 40117 invoked by uid 500); 22 Jul 2015 08:07:55 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 39845 invoked by uid 99); 22 Jul 2015 08:07:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jul 2015 08:07:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5160E2F3C; Wed, 22 Jul 2015 08:07:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Wed, 22 Jul 2015 08:07:56 -0000 Message-Id: <581a64e73eab4e578cc7cdfc08eec39e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk Merge branch 'cassandra-2.2' into trunk Conflicts: src/java/org/apache/cassandra/schema/LegacySchemaTables.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/daa3fe61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/daa3fe61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/daa3fe61 Branch: refs/heads/trunk Commit: daa3fe611fc4a4e53638f9664cce1a734f6fc4d1 Parents: 9ae7126 ee89c7e Author: Sylvain Lebresne Authored: Wed Jul 22 10:07:45 2015 +0200 Committer: Sylvain Lebresne Committed: Wed Jul 22 10:07:45 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/daa3fe61/CHANGES.txt ----------------------------------------------------------------------