Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d583c9dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d583c9dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d583c9dc
Branch: refs/heads/trunk
Commit: d583c9dcad9fc03f034c496ee69d1ba68b7a6878
Parents: a06fc1e 1fb88c0
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jun 25 10:43:49 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jun 25 10:43:49 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 --
src/java/org/apache/cassandra/service/StorageService.java | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d583c9dc/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d583c9dc/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d583c9dc/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
