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/d6528a7e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6528a7e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6528a7e Branch: refs/heads/trunk Commit: d6528a7ebddecb536fac9d8d375a6cd04d052acf Parents: 98cf634 6e7a223 Author: Joshua McKenzie <[email protected]> Authored: Fri Dec 5 14:20:43 2014 -0600 Committer: Joshua McKenzie <[email protected]> Committed: Fri Dec 5 14:20:43 2014 -0600 ---------------------------------------------------------------------- bin/cassandra.ps1 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
