Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1366c0ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1366c0ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1366c0ad Branch: refs/heads/trunk Commit: 1366c0ad51645928f35aeafb59e0e64898b19f0c Parents: 9a4cc22 233bd3c Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 15 15:22:01 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 15 15:22:01 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 2 +- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1366c0ad/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1366c0ad/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
