You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/03/11 20:26:45 UTC
[14/14] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8097d390
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8097d390
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8097d390
Branch: refs/heads/trunk
Commit: 8097d390a285c20aa47954750a80d176a826e47b
Parents: 1de4a98 2257a7a
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Mar 11 14:25:20 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Mar 11 14:25:20 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/Config.java | 7 ++++---
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------