You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/05/02 00:22:33 UTC
[11/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31cd6138
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31cd6138
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31cd6138
Branch: refs/heads/cassandra-2.1
Commit: 31cd61387ea317bb37adf333a8012ccfee7b4fd8
Parents: d66a70e 4ca1a4d
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu May 1 15:21:22 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu May 1 15:21:22 2014 -0700
----------------------------------------------------------------------
lib/licenses/thrift-server-0.3.0.txt | 202 -------------------------
lib/licenses/thrift-server-0.3.3.txt | 202 +++++++++++++++++++++++++
lib/thrift-server-0.3.3.jar | Bin 124160 -> 0 bytes
lib/thrift-server-internal-only-0.3.3.jar | Bin 0 -> 39191 bytes
4 files changed, 202 insertions(+), 202 deletions(-)
----------------------------------------------------------------------