cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 22 May 2015 18:42:47 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
	test/unit/org/apache/cassandra/io/util/DataOutputTest.java


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

Branch: refs/heads/trunk
Commit: 490053820c47cc9cd8a9bf5057bcc516c20a5be9
Parents: 0d24b1a 744db70
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri May 22 13:41:56 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri May 22 13:41:56 2015 -0500

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

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



Mime
View raw message