Merge branch 'cassandra-2.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/1fb88c0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fb88c0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fb88c0b Branch: refs/heads/trunk Commit: 1fb88c0b5ade4e7e6e9e8ed1f13fb9d102d99c3b Parents: 82754e1 2ab7b07 Author: Tyler Hobbs <ty...@datastax.com> Authored: Wed Jun 25 10:41:02 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Wed Jun 25 10:41:02 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 -- src/java/org/apache/cassandra/service/StorageService.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fb88c0b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fb88c0b/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
