You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/09/03 16:36:44 UTC
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3534910
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3534910
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3534910
Branch: refs/heads/cassandra-2.0
Commit: a3534910e1a0bc77dc5739761e695c120f95087c
Parents: 14e7895 8c33e72
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 3 16:36:32 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 3 16:36:32 2013 +0200
----------------------------------------------------------------------
lib/licenses/netty-3.6.6.txt | 202 ++++++++++++++++++++++++++++++++++++++
1 file changed, 202 insertions(+)
----------------------------------------------------------------------