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/778525b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/778525b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/778525b6 Branch: refs/heads/cassandra-1.0 Commit: 778525b62263f11ce0b5546862ad613da95a3fe7 Parents: d6362da 6ab5a08 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 8 21:54:27 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 8 21:54:27 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../cassandra/db/compaction/CompactionTask.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
