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/84dfa064 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84dfa064 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84dfa064 Branch: refs/heads/trunk Commit: 84dfa06475c87bacaee9650f66c5e94b9a0213fd Parents: 5b5d41d d6be037 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Aug 30 03:49:21 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Aug 30 03:49:21 2013 +0300 ---------------------------------------------------------------------- lib/licenses/commons-lang-2.6.txt | 202 ------------------- lib/licenses/commons-lang-3.1.txt | 202 ------------------- lib/licenses/commons-lang3-3.1.txt | 202 +++++++++++++++++++ lib/licenses/compress-lzf-0.8.4.txt | 0 lib/licenses/cql-1.2.0.txt | 202 ------------------- lib/licenses/cql-1.4.0.txt | 202 +++++++++++++++++++ lib/licenses/thrift-python-0.7.0.txt | 324 ------------------------------ lib/licenses/thrift-python-0.9.1.txt | 324 ++++++++++++++++++++++++++++++ 8 files changed, 728 insertions(+), 930 deletions(-) ----------------------------------------------------------------------
