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 4832210557 for ; Mon, 18 Nov 2013 16:34:26 +0000 (UTC) Received: (qmail 97616 invoked by uid 500); 18 Nov 2013 16:34:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 97541 invoked by uid 500); 18 Nov 2013 16:34:23 -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 97401 invoked by uid 99); 18 Nov 2013 16:34:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Nov 2013 16:34:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9C0C8355B2; Mon, 18 Nov 2013 16:34:22 +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: Mon, 18 Nov 2013 16:34:27 -0000 Message-Id: In-Reply-To: <9731a3ee638f4046b7fdc0c46bef6002@git.apache.org> References: <9731a3ee638f4046b7fdc0c46bef6002@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/thrift/CassandraServer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4444fd6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4444fd6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4444fd6f Branch: refs/heads/trunk Commit: 4444fd6ff7464bede6dbcc634ffd3ff8cf1650e7 Parents: 25471ba 1ac6019 Author: Sylvain Lebresne Authored: Mon Nov 18 17:31:49 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Nov 18 17:31:49 2013 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------