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/1365749e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1365749e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1365749e Branch: refs/heads/cassandra-2.0 Commit: 1365749e456ac674c35633141a08dcf1db06599b Parents: 03f4c92 f219e83 Author: Jonathan Ellis <[email protected]> Authored: Thu Dec 26 10:56:08 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Dec 26 10:56:08 2013 -0600 ---------------------------------------------------------------------- .gitignore | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) ----------------------------------------------------------------------
