cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 17 Jun 2014 19:10:02 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/805a4aee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/805a4aee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/805a4aee

Branch: refs/heads/trunk
Commit: 805a4aeebe0ef62159951781a294c40e5be3efe7
Parents: 5bd5e25 a3dc7b8
Author: Jake Luciani <jake@apache.org>
Authored: Tue Jun 17 15:09:31 2014 -0400
Committer: Jake Luciani <jake@apache.org>
Committed: Tue Jun 17 15:09:31 2014 -0400

----------------------------------------------------------------------
 build.xml                               |   2 +-
 lib/licenses/netty-all-4.0.19.Final.txt | 202 ---------------------------
 lib/licenses/netty-all-4.0.20.Final.txt | 202 +++++++++++++++++++++++++++
 lib/netty-all-4.0.19.Final.jar          | Bin 1678810 -> 0 bytes
 lib/netty-all-4.0.20.Final.jar          | Bin 0 -> 1721619 bytes
 5 files changed, 203 insertions(+), 203 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message