Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f114c93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f114c93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f114c93 Branch: refs/heads/trunk Commit: 6f114c93183af1a14fa49f3a6d10b4a0e9c6c298 Parents: 3407ed3 f3bb823 Author: Dave Brosius <dbros...@apache.org> Authored: Wed Aug 21 21:53:01 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Wed Aug 21 21:53:01 2013 -0400 ---------------------------------------------------------------------- lib/licenses/commons-collections-3.2.1.txt | 202 ------------------------ lib/licenses/jetty-6.1.21.txt | 202 ------------------------ lib/licenses/jetty-util-6.1.21.txt | 202 ------------------------ 3 files changed, 606 deletions(-) ----------------------------------------------------------------------