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/41a91e9a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41a91e9a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41a91e9a Branch: refs/heads/trunk Commit: 41a91e9a10b474392fcdb1f870d1509afde2b903 Parents: ca60eac 22f811e Author: Jonathan Ellis <[email protected]> Authored: Thu Jul 17 12:05:05 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jul 17 12:05:05 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
