Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05e033d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05e033d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05e033d9 Branch: refs/heads/trunk Commit: 05e033d97592169aeb9d1358f1c6c9a360a8b38c Parents: b7ed190 aa133b7 Author: Marcus Eriksson <[email protected]> Authored: Mon May 18 15:15:05 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon May 18 15:15:05 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StartupChecks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
