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 7D47FD212 for ; Fri, 16 Nov 2012 23:08:26 +0000 (UTC) Received: (qmail 30037 invoked by uid 500); 16 Nov 2012 23:08:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 29976 invoked by uid 500); 16 Nov 2012 23:08:26 -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 29959 invoked by uid 99); 16 Nov 2012 23:08:26 -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, 16 Nov 2012 23:08:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06BF7314071; Fri, 16 Nov 2012 23:08:26 +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/8] git commit: merge from 1.2 Message-Id: <20121116230826.06BF7314071@tyr.zones.apache.org> Date: Fri, 16 Nov 2012 23:08:26 +0000 (UTC) Updated Branches: refs/heads/trunk 6a2c7c35e -> 7b0b27c52 merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b0b27c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b0b27c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b0b27c5 Branch: refs/heads/trunk Commit: 7b0b27c524bed280173dd37a7277ce62f861a3e7 Parents: 6a2c7c3 f18de00 Author: Pavel Yaskevich Authored: Fri Nov 16 15:08:10 2012 -0800 Committer: Pavel Yaskevich Committed: Fri Nov 16 15:08:10 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 3 ++ .../cassandra/db/DefinitionsUpdateVerbHandler.java | 4 +- src/java/org/apache/cassandra/db/DefsTable.java | 26 +++++++++++--- src/java/org/apache/cassandra/db/RowMutation.java | 3 ++ .../org/apache/cassandra/net/MessagingService.java | 8 ++-- .../apache/cassandra/service/MigrationManager.java | 9 +++-- .../org/apache/cassandra/cli/CliHelp.yaml | 2 +- 7 files changed, 38 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b0b27c5/CHANGES.txt ----------------------------------------------------------------------