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/e607d944 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e607d944 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e607d944 Branch: refs/heads/cassandra-2.1 Commit: e607d944d702e745f9bd2739bb1fc1b307fcbf2b Parents: b8b3776 54d2e8e Author: Jonathan Ellis <[email protected]> Authored: Wed Aug 6 13:29:53 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Aug 6 13:29:53 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 55 ++------------------ .../cassandra/config/DatabaseDescriptor.java | 2 +- .../cassandra/db/filter/SliceQueryFilter.java | 4 +- 3 files changed, 8 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e607d944/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e607d944/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
