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/75c376db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75c376db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75c376db Branch: refs/heads/trunk Commit: 75c376db87d82de719d94afa0e5a1321cd2b1924 Parents: e68f52b c4c56fa Author: Joshua McKenzie <[email protected]> Authored: Thu Oct 2 14:25:19 2014 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Thu Oct 2 14:25:19 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
