Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee5aec2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee5aec2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee5aec2d Branch: refs/heads/trunk Commit: ee5aec2d2ed7795d64a052e191af4aec5c807dba Parents: 22f02fe bf917cb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jan 18 15:26:06 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Jan 18 15:26:06 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StartupChecks.java | 2 +- src/java/org/apache/cassandra/utils/SigarLibrary.java | 9 ++++++++- src/java/org/apache/cassandra/utils/UUIDGen.java | 12 ++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee5aec2d/CHANGES.txt ----------------------------------------------------------------------
