Updated Branches: refs/heads/trunk 92813d9f0 -> 5080f7a25
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/5080f7a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5080f7a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5080f7a2 Branch: refs/heads/trunk Commit: 5080f7a256bf02e067312d2f794ad6b61ef6bcdd Parents: 92813d9 edd7f45 Author: Sylvain Lebresne <sylv...@riptano.com> Authored: Mon Feb 6 10:43:57 2012 +0100 Committer: Sylvain Lebresne <sylv...@riptano.com> Committed: Mon Feb 6 10:43:57 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 23 ++++++++------- .../apache/cassandra/io/sstable/SSTableReader.java | 5 ++- .../cassandra/net/OutboundTcpConnection.java | 5 --- 4 files changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5080f7a2/CHANGES.txt ----------------------------------------------------------------------