Merge branch 'cassandra-3.X' into trunk

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

Branch: refs/heads/trunk
Commit: cd728d2e735643b266303ae3adc8aeccad1e080b
Parents: 0b82c4f f1b742e
Author: Robert Stupp <sn...@snazy-ds15.fritz.box>
Authored: Wed Oct 12 13:45:27 2016 +0200
Committer: Robert Stupp <sn...@snazy-ds15.fritz.box>
Committed: Wed Oct 12 13:45:27 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


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

Reply via email to