Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32358d64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32358d64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32358d64 Branch: refs/heads/trunk Commit: 32358d646d7fc214a1bc16d58ca5e5d5b025bda6 Parents: f92ae20 756c85e Author: Joshua McKenzie <josh.mcken...@datastax.com> Authored: Thu Aug 7 12:06:52 2014 -0500 Committer: Joshua McKenzie <josh.mcken...@datastax.com> Committed: Thu Aug 7 12:06:52 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/config/YamlConfigurationLoader.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32358d64/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java ----------------------------------------------------------------------
