Merge branch 'cassandra-2.1.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/3fc8bb1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fc8bb1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fc8bb1e Branch: refs/heads/cassandra-2.1 Commit: 3fc8bb1edf4f6eddd3f92e6b6809a22d427dfd2e Parents: b2c511e 83b3f13 Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri Jul 25 14:27:12 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri Jul 25 14:27:12 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 3 ++- bin/cassandra-cli | 1 + bin/cassandra-shuffle | 1 + bin/cassandra.in.sh | 4 ++++ bin/nodetool | 1 + bin/sstablekeys | 1 + bin/sstableloader | 1 + bin/sstablescrub | 1 + bin/sstableupgrade | 1 + tools/bin/cassandra-stress | 4 +++- tools/bin/cassandra-stressd | 4 +++- tools/bin/cassandra.in.sh | 4 ++++ tools/bin/json2sstable | 1 + tools/bin/sstable2json | 1 + tools/bin/sstablelevelreset | 1 + tools/bin/sstablemetadata | 1 + tools/bin/sstablerepairedset | 1 + tools/bin/sstablesplit | 1 + 19 files changed, 30 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fc8bb1e/CHANGES.txt ----------------------------------------------------------------------
