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/f0def341 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0def341 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0def341 Branch: refs/heads/trunk Commit: f0def34125ae38353a6f4a9a107a545ae97bea87 Parents: 36448a3 31cd613 Author: Mikhail Stepura <mish...@apache.org> Authored: Thu May 1 15:21:32 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Thu May 1 15:21:32 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(-) ----------------------------------------------------------------------
