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/a1f65c34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f65c34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1f65c34 Branch: refs/heads/trunk Commit: a1f65c34fb6ae0f05545a603191938669e63c83c Parents: 0af4ae2 160cbc1 Author: Benedict Elliott Smith <[email protected]> Authored: Wed Jan 28 22:44:41 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Jan 28 22:44:41 2015 +0000 ---------------------------------------------------------------------- conf/cassandra.yaml | 6 +----- src/java/org/apache/cassandra/config/Config.java | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1f65c34/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1f65c34/src/java/org/apache/cassandra/config/Config.java ----------------------------------------------------------------------
