Updated Branches: refs/heads/cassandra-1.0 68d4e28d9 -> 2a1ec27e2 refs/heads/trunk a5b3abb66 -> 73f7104cd
Merge branch 'cassandra-1.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/73f7104c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73f7104c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73f7104c Branch: refs/heads/trunk Commit: 73f7104cd356485332298f0a2fdddf9aecfbbca6 Parents: a5b3abb 2a1ec27 Author: Jonathan Ellis <[email protected]> Authored: Fri Jan 27 09:29:35 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jan 27 09:29:35 2012 -0600 ---------------------------------------------------------------------- bin/cassandra-cli.bat | 2 +- bin/cassandra.bat | 2 +- bin/json2sstable.bat | 8 ++++---- bin/nodetool.bat | 5 ++--- bin/sstable2json.bat | 8 ++++---- bin/sstablekeys.bat | 8 ++++---- 6 files changed, 16 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
