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/e3d5b98e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3d5b98e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3d5b98e Branch: refs/heads/trunk Commit: e3d5b98e488d0942505e84c9a8bd2c5f810447d8 Parents: 93942ba abe8590 Author: Jonathan Ellis <[email protected]> Authored: Thu Jul 31 15:49:47 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jul 31 15:49:47 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.in.bat | 50 +++++++++++++++++++++++++++++++++++++++++ tools/bin/cassandra.in.bat | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) ----------------------------------------------------------------------
