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/a1f7ccfb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f7ccfb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1f7ccfb Branch: refs/heads/trunk Commit: a1f7ccfb2446b332a42f95cb57bfa53fdf625df5 Parents: 7dda131 b21bb3f Author: Joshua McKenzie <[email protected]> Authored: Wed Oct 22 13:42:48 2014 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Wed Oct 22 13:42:48 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
