Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bbabe15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bbabe15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bbabe15 Branch: refs/heads/trunk Commit: 2bbabe154e350d4b1b69cb8d8bb2290d620db81d Parents: a552b30 4a439d2 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Nov 4 16:13:06 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Nov 4 16:13:06 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 6 + conf/cassandra.yaml | 4 + .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 8 + .../org/apache/cassandra/transport/Frame.java | 150 +++++++++++-------- 6 files changed, 111 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
