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 4DE949545 for ; Wed, 22 Feb 2012 19:07:39 +0000 (UTC) Received: (qmail 43611 invoked by uid 500); 22 Feb 2012 19:07:39 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 43587 invoked by uid 500); 22 Feb 2012 19:07:39 -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 43578 invoked by uid 99); 22 Feb 2012 19:07:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 19:07:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 19:07:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 18C7E81242B; Wed, 22 Feb 2012 19:07:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xedin@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: merge from 1.1 Message-Id: <20120222190718.18C7E81242B@tyr.zones.apache.org> Date: Wed, 22 Feb 2012 19:07:18 +0000 (UTC) Updated Branches: refs/heads/trunk d359d8f61 -> 7f3704172 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f370417 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f370417 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f370417 Branch: refs/heads/trunk Commit: 7f3704172d919971f38528d872ef011f378c5137 Parents: d359d8f e376bc0 Author: Pavel Yaskevich Authored: Wed Feb 22 22:05:20 2012 +0300 Committer: Pavel Yaskevich Committed: Wed Feb 22 22:05:20 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 + interface/cassandra.thrift | 1 - .../org/apache/cassandra/thrift/Cassandra.java | 6 +- .../org/apache/cassandra/thrift/CfDef.java | 96 +---------- .../org/apache/cassandra/config/CFMetaData.java | 23 +--- src/java/org/apache/cassandra/config/Schema.java | 18 ++ .../cassandra/cql/CreateColumnFamilyStatement.java | 1 - .../statements/CreateColumnFamilyStatement.java | 1 - src/java/org/apache/cassandra/db/Table.java | 25 +++- .../apache/cassandra/service/MigrationManager.java | 144 +++++++++++---- .../apache/cassandra/service/StorageService.java | 7 +- .../cassandra/service/StorageServiceMBean.java | 4 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 3 + src/java/org/apache/cassandra/tools/NodeProbe.java | 6 +- test/unit/org/apache/cassandra/SchemaLoader.java | 6 +- test/unit/org/apache/cassandra/db/DefsTest.java | 4 +- 16 files changed, 172 insertions(+), 175 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f370417/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------