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 1611111B35 for ; Thu, 31 Jul 2014 20:42:37 +0000 (UTC) Received: (qmail 30424 invoked by uid 500); 31 Jul 2014 20:42:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 30309 invoked by uid 500); 31 Jul 2014 20:42:36 -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 30284 invoked by uid 99); 31 Jul 2014 20:42:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jul 2014 20:42:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 847BA951610; Thu, 31 Jul 2014 20:42:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Thu, 31 Jul 2014 20:42:37 -0000 Message-Id: <6a6ec2367b6a4a3f9c8f14864218d992@git.apache.org> In-Reply-To: <4f7507438c0d46ab91fe8682f406984b@git.apache.org> References: <4f7507438c0d46ab91fe8682f406984b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0 Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: test/unit/org/apache/cassandra/service/MoveTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85bcd2d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85bcd2d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85bcd2d7 Branch: refs/heads/cassandra-2.1 Commit: 85bcd2d744ceb3f0d0cef8de6c165c5c2f53b602 Parents: 8e4415b 1879d99 Author: Tyler Hobbs Authored: Thu Jul 31 15:42:02 2014 -0500 Committer: Tyler Hobbs Committed: Thu Jul 31 15:42:02 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/service/MoveTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/85bcd2d7/test/unit/org/apache/cassandra/service/MoveTest.java ----------------------------------------------------------------------