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/448e4d46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/448e4d46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/448e4d46 Branch: refs/heads/trunk Commit: 448e4d46f0e050ddbb7b43aace463ff881eff7c5 Parents: 56e4842 ca7335e Author: Brandon Williams <[email protected]> Authored: Thu Dec 12 12:05:07 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Thu Dec 12 12:05:07 2013 -0600 ---------------------------------------------------------------------- bin/cassandra.in.sh | 7 +++++++ bin/json2sstable | 2 +- bin/nodetool | 2 +- bin/sstable2json | 2 +- bin/sstablekeys | 2 +- bin/sstableloader | 2 +- bin/sstablescrub | 2 +- bin/sstablesplit | 2 +- bin/sstableupgrade | 2 +- 9 files changed, 15 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
