Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/thrift/CassandraServer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4444fd6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4444fd6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4444fd6f
Branch: refs/heads/cassandra-2.0
Commit: 4444fd6ff7464bede6dbcc634ffd3ff8cf1650e7
Parents: 25471ba 1ac6019
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Mon Nov 18 17:31:49 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Mon Nov 18 17:31:49 2013 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
