You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by db...@apache.org on 2016/07/01 20:14:34 UTC

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
	lib/licenses/crc32ex-0.1.1.txt
	lib/licenses/snappy-java-1.0.5.2.txt
	lib/licenses/snappy-java-1.0.5.txt
	lib/licenses/snappy-java-1.1.1.7.txt
	lib/licenses/thrift-server-0.3.5.txt
	lib/licenses/thrift-server-0.3.7.txt


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

Branch: refs/heads/cassandra-3.0
Commit: 65f8bb6c4635fee4e17b2023915701dce59bc3c8
Parents: da20fec bd6ad43
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jul 1 16:10:55 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jul 1 16:10:55 2016 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------