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 3C02F11B7E for ; Wed, 23 Apr 2014 23:03:31 +0000 (UTC) Received: (qmail 90942 invoked by uid 500); 23 Apr 2014 23:03:30 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 90895 invoked by uid 500); 23 Apr 2014 23:03:29 -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 90876 invoked by uid 99); 23 Apr 2014 23:03:29 -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, 23 Apr 2014 23:03:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 31D7898FB85; Wed, 23 Apr 2014 23:03:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Wed, 23 Apr 2014 23:03:30 -0000 Message-Id: <92dc7ef37666495fa2c21e36ae223788@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6acbb33f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6acbb33f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6acbb33f Branch: refs/heads/cassandra-2.1 Commit: 6acbb33fa4191e60d5e9cdd58f815dea7c2ff616 Parents: 072b488 c3550fe Author: Aleksey Yeschenko Authored: Thu Apr 24 02:03:16 2014 +0300 Committer: Aleksey Yeschenko Committed: Thu Apr 24 02:03:16 2014 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------