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/aa25f67e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa25f67e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa25f67e Branch: refs/heads/trunk Commit: aa25f67eaff3b620d635a07e1f6b60466dac3c10 Parents: 6477fa9 ef9473a Author: Jonathan Ellis <[email protected]> Authored: Fri Jul 25 17:26:05 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jul 25 17:26:05 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra-cli.bat | 21 +- bin/cassandra-shuffle.bat | 20 +- bin/cassandra.bat | 3 +- bin/cassandra.ps1 | 839 ++++++++++++++++++++++++------------ bin/cqlsh.bat | 68 +-- bin/debug-cql.bat | 100 ++--- bin/nodetool.bat | 20 +- bin/source-conf.ps1 | 114 ++--- bin/sstablekeys.bat | 26 +- bin/sstableloader.bat | 102 ++--- bin/sstablescrub.bat | 102 ++--- bin/sstableupgrade.bat | 102 ++--- bin/stop-server.bat | 110 ++--- bin/stop-server.ps1 | 356 +++++++-------- conf/cassandra-env.ps1 | 648 ++++++++++++++-------------- tools/bin/cassandra-stress.bat | 21 +- tools/bin/json2sstable.bat | 25 +- tools/bin/sstable2json.bat | 25 +- tools/bin/sstablemetadata.bat | 15 +- tools/bin/sstablesplit.bat | 102 ++--- 21 files changed, 1435 insertions(+), 1385 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa25f67e/CHANGES.txt ----------------------------------------------------------------------
