You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/11/17 00:08:26 UTC
[1/8] git commit: merge from 1.2
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 <py...@twitter.com>
Authored: Fri Nov 16 15:08:10 2012 -0800
Committer: Pavel Yaskevich <py...@twitter.com>
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
----------------------------------------------------------------------