You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by ad...@apache.org on 2017/09/12 13:56:42 UTC

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a679cf5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a679cf5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a679cf5

Branch: refs/heads/trunk
Commit: 1a679cf5b612410d72fc69918617aad258821e4c
Parents: 826c9f4 1284193
Author: Andrés de la Peña <a....@gmail.com>
Authored: Tue Sep 12 14:55:31 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Tue Sep 12 14:55:31 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                          |  1 +
 conf/cassandra.yaml                                  |  5 +++--
 .../apache/cassandra/config/DatabaseDescriptor.java  | 15 +++++++++++++++
 src/java/org/apache/cassandra/utils/FBUtilities.java |  7 +++++--
 4 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org