Updated Branches: refs/heads/trunk 3e1745ae5 -> e9b692586
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/e9b69258 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9b69258 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9b69258 Branch: refs/heads/trunk Commit: e9b692586ec79f7d56aa47e3bc843ea3eb386ce7 Parents: 3e1745a 9a336a1 Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Feb 7 23:53:35 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Feb 7 23:53:58 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 + src/java/org/apache/cassandra/cli/CliClient.java | 162 ++++++++------- .../apache/cassandra/db/HintedHandOffManager.java | 4 +- .../apache/cassandra/db/marshal/CompositeType.java | 5 + .../apache/cassandra/service/StorageService.java | 9 +- .../cassandra/service/StorageServiceMBean.java | 2 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 1 - .../org/apache/cassandra/tools/SSTableImport.java | 4 +- test/unit/org/apache/cassandra/db/DefsTest.java | 5 +- 9 files changed, 108 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
