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/90890080 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90890080 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90890080 Branch: refs/heads/trunk Commit: 9089008007b72ccd25ada2e33c253646b3920ea8 Parents: 452dd10 7cf3f19 Author: Joshua McKenzie <[email protected]> Authored: Fri Oct 24 11:05:13 2014 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Fri Oct 24 11:05:13 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
