You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/18 18:22:54 UTC
[8/8] git commit: Merge branch 'cassandra-2.1' into trunk
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/ba23b820
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba23b820
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba23b820
Branch: refs/heads/trunk
Commit: ba23b82064cb5b8c32687031fd4f0d5a76a4026e
Parents: 434e042 f628bd8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Feb 18 11:22:33 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Feb 18 11:22:33 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 2 +
conf/cassandra.yaml | 3 +
lib/licenses/super-csv-2.1.0.txt | 202 +++++++++++++++++++
lib/super-csv-2.1.0.jar | Bin 0 -> 91473 bytes
.../org/apache/cassandra/config/Config.java | 49 ++++-
.../cassandra/config/DatabaseDescriptor.java | 40 +++-
.../config/YamlConfigurationLoader.java | 1 +
.../apache/cassandra/service/StorageProxy.java | 22 +-
.../cassandra/service/StorageProxyMBean.java | 3 +
.../org/apache/cassandra/tools/NodeProbe.java | 5 +
.../org/apache/cassandra/tools/NodeTool.java | 9 +-
12 files changed, 332 insertions(+), 5 deletions(-)
----------------------------------------------------------------------