Merge branch 'cassandra-3.0' into cassandra-3.3

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

Branch: refs/heads/trunk
Commit: fd5b1dee3854518af7aea080e6b0639b7b8d9adc
Parents: 19f6075 5ad8114
Author: Sam Tunnicliffe <s...@beobal.com>
Authored: Tue Jan 5 10:42:58 2016 +0000
Committer: Sam Tunnicliffe <s...@beobal.com>
Committed: Tue Jan 5 10:42:58 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                              | 1 +
 src/java/org/apache/cassandra/service/StartupChecks.java | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


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

Reply via email to