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/fb7e0b1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7e0b1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7e0b1c Branch: refs/heads/trunk Commit: fb7e0b1c23e594abf00a8a243b44134a8f3d2c96 Parents: 8664e3a 21e6ec6 Author: Brandon Williams <[email protected]> Authored: Thu Oct 24 09:57:12 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Oct 24 09:57:12 2013 -0500 ---------------------------------------------------------------------- bin/cqlsh.bat | 18 +++++++++++++++++- debian/changelog | 2 +- .../apache/cassandra/service/StorageService.java | 3 ++- 3 files changed, 20 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7e0b1c/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
