Merge branch 'cassandra-2.0' into trunk
Conflicts:
lib/licenses/slf4j-log4j12-1.7.2.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ea3b153
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ea3b153
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ea3b153
Branch: refs/heads/trunk
Commit: 5ea3b153840d069b50361f38b8b7050f3c09176b
Parents: 4e52e0d a353491
Author: Sylvain Lebresne <[email protected]>
Authored: Tue Sep 3 16:38:09 2013 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Tue Sep 3 16:38:09 2013 +0200
----------------------------------------------------------------------
NEWS.txt | 4 +-
build.xml | 4 +-
debian/changelog | 8 +-
lib/licenses/netty-3.5.2.txt | 202 -----------------------------
lib/licenses/netty-3.5.9.txt | 202 +++++++++++++++++++++++++++++
lib/licenses/netty-3.6.6.txt | 202 +++++++++++++++++++++++++++++
lib/licenses/slf4j-api-1.6.1.txt | 20 ---
lib/licenses/slf4j-api-1.7.2.txt | 20 +++
lib/licenses/snappy-java-1.0.4.1.txt | 209 ------------------------------
lib/licenses/snappy-java-1.0.5.txt | 209 ++++++++++++++++++++++++++++++
lib/netty-3.5.9.Final.jar | Bin 1128961 -> 0 bytes
lib/netty-3.6.6.Final.jar | Bin 0 -> 1206119 bytes
12 files changed, 645 insertions(+), 435 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ea3b153/build.xml
----------------------------------------------------------------------
