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/07/15 22:15:31 UTC
[8/8] 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/da650f3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da650f3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da650f3c
Branch: refs/heads/trunk
Commit: da650f3c62bad24a3761e90b939cf98fcd1e04e5
Parents: ae25812 9a4cc22
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 15 15:15:16 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 15 15:15:16 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
conf/cassandra.yaml | 23 +++++++++++++++-----
.../org/apache/cassandra/config/Config.java | 6 ++---
.../cassandra/config/DatabaseDescriptor.java | 6 +++++
4 files changed, 28 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/da650f3c/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/da650f3c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------