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/744acdfc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/744acdfc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/744acdfc Branch: refs/heads/trunk Commit: 744acdfc8f2be6edd7be9cb57554ee34963a4daf Parents: fb89e2b 9efe99d Author: Jonathan Ellis <[email protected]> Authored: Wed May 2 09:55:20 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 2 09:55:20 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../concurrent/DebuggableThreadPoolExecutor.java | 27 +++++++- src/java/org/apache/cassandra/db/ColumnFamily.java | 2 +- .../apache/cassandra/io/sstable/SSTableReader.java | 2 +- .../org/apache/cassandra/net/MessagingService.java | 7 +-- .../cassandra/io/sstable/SSTableWriterTest.java | 56 +++++++++++++++ 6 files changed, 85 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/744acdfc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/744acdfc/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/744acdfc/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/744acdfc/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/744acdfc/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
