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 2014/03/25 13:54:51 UTC

[1/2] git commit: Add back Netty 3 jar to stress lib dir for #6911

Repository: cassandra
Updated Branches:
  refs/heads/trunk f63fafbfa -> e90489fdf


Add back Netty 3 jar to stress lib dir for #6911


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

Branch: refs/heads/trunk
Commit: 43092aac9609efa93dafbc5627ec3f88459f7f6f
Parents: 9ef8815
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 25 13:52:35 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 25 13:52:35 2014 +0100

----------------------------------------------------------------------
 tools/lib/cassandra-driver-core-2.0.0.jar | Bin 519527 -> 0 bytes
 tools/lib/cassandra-driver-core-2.0.1.jar | Bin 0 -> 519771 bytes
 tools/lib/netty-3.9.0.Final.jar           | Bin 0 -> 1231993 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/43092aac/tools/lib/cassandra-driver-core-2.0.0.jar
----------------------------------------------------------------------
diff --git a/tools/lib/cassandra-driver-core-2.0.0.jar b/tools/lib/cassandra-driver-core-2.0.0.jar
deleted file mode 100644
index f4343c3..0000000
Binary files a/tools/lib/cassandra-driver-core-2.0.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43092aac/tools/lib/cassandra-driver-core-2.0.1.jar
----------------------------------------------------------------------
diff --git a/tools/lib/cassandra-driver-core-2.0.1.jar b/tools/lib/cassandra-driver-core-2.0.1.jar
new file mode 100644
index 0000000..efdff92
Binary files /dev/null and b/tools/lib/cassandra-driver-core-2.0.1.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43092aac/tools/lib/netty-3.9.0.Final.jar
----------------------------------------------------------------------
diff --git a/tools/lib/netty-3.9.0.Final.jar b/tools/lib/netty-3.9.0.Final.jar
new file mode 100644
index 0000000..872340e
Binary files /dev/null and b/tools/lib/netty-3.9.0.Final.jar differ


[2/2] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by sl...@apache.org.
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/e90489fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e90489fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e90489fd

Branch: refs/heads/trunk
Commit: e90489fdfa3045e2b7212a8eaf88e191e7764989
Parents: f63fafb 43092aa
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 25 13:54:44 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 25 13:54:44 2014 +0100

----------------------------------------------------------------------
 tools/lib/cassandra-driver-core-2.0.0.jar | Bin 519527 -> 0 bytes
 tools/lib/cassandra-driver-core-2.0.1.jar | Bin 0 -> 519771 bytes
 tools/lib/netty-3.9.0.Final.jar           | Bin 0 -> 1231993 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------