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:07:50 UTC
[1/6] git commit: merge from 1.2.0
Updated Branches:
refs/heads/cassandra-1.2 dd25078f4 -> f18de00b1
merge from 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f18de00b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f18de00b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f18de00b
Branch: refs/heads/cassandra-1.2
Commit: f18de00b1cbe762cf7e278e5b5722b457328c2f0
Parents: dd25078 bd33330
Author: Pavel Yaskevich <py...@twitter.com>
Authored: Fri Nov 16 15:07:33 2012 -0800
Committer: Pavel Yaskevich <py...@twitter.com>
Committed: Fri Nov 16 15:07:33 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/f18de00b/CHANGES.txt
----------------------------------------------------------------------