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/8fb393ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fb393ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fb393ec Branch: refs/heads/trunk Commit: 8fb393ec3e54d73fd51ff8a827fe6c87d487e98e Parents: 34e6bd5 6c8271f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jun 12 14:46:24 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jun 12 14:46:24 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fb393ec/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fb393ec/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
