Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edd97d4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edd97d4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edd97d4e Branch: refs/heads/cassandra-1.1 Commit: edd97d4e1b78376453cd04ab4062cf61a24d9c4f Parents: 875e05a 33199c6 Author: Jonathan Ellis <[email protected]> Authored: Wed Feb 15 17:34:20 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Feb 15 17:34:20 2012 -0600 ---------------------------------------------------------------------- .rat-excludes | 2 +- CHANGES.txt | 2 +- build.xml | 4 +- 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 | 2 +- .../compaction/CompactionInterruptedException.java | 21 +++++++++ .../apache/cassandra/db/filter/ExtendedFilter.java | 21 +++++++++ .../org/apache/cassandra/thrift/RequestType.java | 35 ++++++++++++--- .../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 21 +++++++++ 11 files changed, 127 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edd97d4e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
