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