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 BDCE1177C7 for ; Wed, 5 Nov 2014 13:32:08 +0000 (UTC) Received: (qmail 45844 invoked by uid 500); 5 Nov 2014 13:32:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 45814 invoked by uid 500); 5 Nov 2014 13:32:08 -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 45801 invoked by uid 99); 5 Nov 2014 13:32:08 -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, 05 Nov 2014 13:32:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 41827A0A945; Wed, 5 Nov 2014 13:32:08 +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, 05 Nov 2014 13:32:08 -0000 Message-Id: <84ec9d5f10054e4c90ef6279885e943b@git.apache.org> In-Reply-To: <8f092c8154e3400ea75e4f0310f5b853@git.apache.org> References: <8f092c8154e3400ea75e4f0310f5b853@git.apache.org> 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: 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/98acdb8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98acdb8d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98acdb8d Branch: refs/heads/cassandra-2.1 Commit: 98acdb8dd12d295ad8c61a460947f581174550de Parents: e16f584 32da3c8 Author: Aleksey Yeschenko Authored: Wed Nov 5 16:31:55 2014 +0300 Committer: Aleksey Yeschenko Committed: Wed Nov 5 16:31:55 2014 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------