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 EF74810197 for ; Fri, 13 Sep 2013 18:54:37 +0000 (UTC) Received: (qmail 81632 invoked by uid 500); 13 Sep 2013 18:54:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 81585 invoked by uid 500); 13 Sep 2013 18:54:37 -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 81467 invoked by uid 99); 13 Sep 2013 18:54:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Sep 2013 18:54:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 24463822D0C; Fri, 13 Sep 2013 18:54:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 13 Sep 2013 18:54:40 -0000 Message-Id: <43249eb34c8340c18b8d10be79b85804@git.apache.org> In-Reply-To: <9792e69909634eb89a5c1feade71a111@git.apache.org> References: <9792e69909634eb89a5c1feade71a111@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab7fed68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab7fed68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab7fed68 Branch: refs/heads/trunk Commit: ab7fed6834ca675520651c2d3bf9dc1a8109fa36 Parents: c9f4f0d b281dd1 Author: Brandon Williams Authored: Fri Sep 13 13:53:51 2013 -0500 Committer: Brandon Williams Committed: Fri Sep 13 13:53:51 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7fed68/src/java/org/apache/cassandra/tools/StandaloneSplitter.java ----------------------------------------------------------------------