Merge branch 'cassandra-2.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/d6f3cdf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6f3cdf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6f3cdf6 Branch: refs/heads/trunk Commit: d6f3cdf6ff38fcd301098a91d32bb2b4b47d2df0 Parents: be6cf8a 8d06dd1 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Aug 3 00:45:48 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Aug 3 00:45:48 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/d6f3cdf6/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6f3cdf6/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
