natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cassandra/interface
History
Jake Luciani 235bae7b30 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	interface/cassandra.thrift
	src/java/org/apache/cassandra/thrift/CassandraServer.java
	test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
 		2014-05-28 13:55:32 -04:00
..
thrift/gen-java/org/apache/cassandra/thrift Merge branch 'cassandra-2.1' into trunk 2014-05-28 13:55:32 -04:00
cassandra.thrift Backport MultiSliceRequest 2014-05-28 12:50:35 -04:00