You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/08/06 20:30:20 UTC
[19/19] git commit: Merge branch 'cassandra-2.1' into trunk
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/trunk
Commit: e607d944d702e745f9bd2739bb1fc1b307fcbf2b
Parents: b8b3776 54d2e8e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 6 13:29:53 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
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
----------------------------------------------------------------------