Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fee6152 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fee6152 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fee6152 Branch: refs/heads/trunk Commit: 1fee61520ee47820e9938f8e78db884309e3a7e5 Parents: f7c994e ef08f94 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Aug 11 13:45:39 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Aug 11 13:45:39 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +- test/system/test_thrift_server.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fee6152/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fee6152/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
