You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/08 01:05:39 UTC
[12/12] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66182082
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66182082
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66182082
Branch: refs/heads/trunk
Commit: 66182082cf6b02d1d3a50c48e99e52a4ccd795c9
Parents: 9cf1068 23becce
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 7 18:05:23 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 7 18:05:23 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 ++--
lib/thrift-server-0.2.1.jar | Bin 123693 -> 0 bytes
lib/thrift-server-0.3.0.jar | Bin 0 -> 123898 bytes
.../cassandra/thrift/THsHaDisruptorServer.java | 3 ++-
5 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------