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/6921af28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6921af28 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6921af28 Branch: refs/heads/trunk Commit: 6921af28a8f18499dec9cace1ff553ff39fed378 Parents: d2a3827 2420cb4 Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 23 10:29:36 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 23 10:29:36 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../apache/cassandra/config/YamlConfigurationLoader.java | 10 ---------- 2 files changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6921af28/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6921af28/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java ----------------------------------------------------------------------
