Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb58d80d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb58d80d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb58d80d Branch: refs/heads/trunk Commit: bb58d80d1790facb554501bbee6a9d00fcae2381 Parents: aa9894d 19a2077 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Jun 9 21:15:29 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Jun 9 21:15:29 2014 -0400 ---------------------------------------------------------------------- .gitignore | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
