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/8d06dd10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d06dd10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d06dd10 Branch: refs/heads/cassandra-2.1 Commit: 8d06dd102dd3b119cd1f74a88813c4e6c72e453d Parents: 6b34d46 57abab1 Author: Dave Brosius <[email protected]> Authored: Sun Aug 3 00:39:59 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Aug 3 00:39:59 2014 -0400 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ .../apache/cassandra/thrift/CassandraServer.java | 7 ++----- .../cassandra/cql3/StaticColumnsQueryTest.java | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
