Updated Branches: refs/heads/trunk 62491eaa2 -> 6dfad417f
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6dfad417 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dfad417 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dfad417 Branch: refs/heads/trunk Commit: 6dfad417f8706f5706b140e0a9fc0a28d38bba3f Parents: 0dea8dc 62491ea Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Fri Feb 17 14:58:42 2012 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Fri Feb 17 14:58:42 2012 -0800 ---------------------------------------------------------------------- .rat-excludes | 2 +- CHANGES.txt | 7 +- bin/cqlsh | 167 +++++++++++---- build.xml | 6 +- debian/changelog | 6 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 10 +- .../org/apache/cassandra/db/SnapshotCommand.java | 21 ++ src/java/org/apache/cassandra/db/SuperColumn.java | 30 +++- src/java/org/apache/cassandra/db/SystemTable.java | 2 +- .../db/compaction/CompactionController.java | 8 + .../compaction/CompactionInterruptedException.java | 21 ++ .../apache/cassandra/db/filter/ExtendedFilter.java | 21 ++ .../org/apache/cassandra/dht/RangeStreamer.java | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- .../org/apache/cassandra/thrift/RequestType.java | 35 +++- .../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 21 ++ .../cassandra/io/LazilyCompactedRowTest.java | 12 +- .../io/sstable/SSTableSimpleWriterTest.java | 3 +- 18 files changed, 304 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6dfad417/CHANGES.txt ----------------------------------------------------------------------
