Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04e6dfb3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04e6dfb3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04e6dfb3 Branch: refs/heads/cassandra-1.1 Commit: 04e6dfb3022e4477331b0b25e4e876c7e9bcdba2 Parents: a47d4cb f943a6e Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 22 09:37:29 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 22 09:37:29 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliOptions.java | 4 -- .../org/apache/cassandra/cli/CliSessionState.java | 2 +- .../service/AbstractWriteResponseHandler.java | 27 --------------- .../cassandra/service/IWriteResponseHandler.java | 1 - .../org/apache/cassandra/service/StorageProxy.java | 5 +-- 6 files changed, 4 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04e6dfb3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04e6dfb3/src/java/org/apache/cassandra/cli/CliOptions.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04e6dfb3/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
