Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6772247f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6772247f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6772247f Branch: refs/heads/trunk Commit: 6772247f828e3740aff737b8c4463612ba8d4b17 Parents: e4d4472 cf83c81 Author: Jonathan Ellis <[email protected]> Authored: Wed Dec 4 17:56:45 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Dec 4 17:56:45 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 6 ++++-- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6772247f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6772247f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
