cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 03 Apr 2014 00:56:38 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6471d0ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6471d0ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6471d0ca

Branch: refs/heads/trunk
Commit: 6471d0caa451337fcf37ce5493208e07e2bafe3e
Parents: afb5ce5 f3d8ecf
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Wed Apr 2 20:55:46 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Wed Apr 2 20:55:46 2014 -0400

----------------------------------------------------------------------
 build.xml                               |  10 ++--
 lib/licenses/logback-classic-1.0.13.txt |  70 ---------------------------
 lib/licenses/logback-classic-1.1.12.txt |  70 +++++++++++++++++++++++++++
 lib/licenses/logback-core-1.0.13.txt    |  70 ---------------------------
 lib/licenses/logback-core-1.1.12.txt    |  70 +++++++++++++++++++++++++++
 lib/logback-classic-1.0.13.jar          | Bin 264600 -> 0 bytes
 lib/logback-classic-1.1.2.jar           | Bin 0 -> 270750 bytes
 lib/logback-core-1.0.13.jar             | Bin 418870 -> 0 bytes
 lib/logback-core-1.1.12.jar             | Bin 0 -> 427729 bytes
 9 files changed, 145 insertions(+), 145 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6471d0ca/build.xml
----------------------------------------------------------------------


Mime
View raw message