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 66B20D86D for ; Wed, 18 Jul 2012 15:36:11 +0000 (UTC) Received: (qmail 84924 invoked by uid 500); 18 Jul 2012 15:36:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 84825 invoked by uid 500); 18 Jul 2012 15:36:10 -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 84797 invoked by uid 99); 18 Jul 2012 15:36:10 -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, 18 Jul 2012 15:36:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7F9A415222; Wed, 18 Jul 2012 15:36:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eevans@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Message-Id: <20120718153610.7F9A415222@tyr.zones.apache.org> Date: Wed, 18 Jul 2012 15:36:10 +0000 (UTC) Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f4bdb43 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f4bdb43 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f4bdb43 Branch: refs/heads/vnodes Commit: 7f4bdb4338a3e05948239c5edf89a11011dc2e2f Parents: d09c369 c0a7c03 Author: Eric Evans Authored: Wed Jul 18 10:32:17 2012 -0500 Committer: Eric Evans Committed: Wed Jul 18 10:32:17 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 25 --------------- 1 files changed, 0 insertions(+), 25 deletions(-) ----------------------------------------------------------------------