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:43 UTC
[12/14] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2257a7a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2257a7a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2257a7a7
Branch: refs/heads/trunk
Commit: 2257a7a7e25343163b1dfb20f12ef43e19f5a003
Parents: 46860aa 2d48ddf
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Mar 11 14:25:01 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Mar 11 14:25:01 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2257a7a7/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2257a7a7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------