natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,429 Commits 17 Branches 338 Tags 665 MiB
Commit Graph

1 Commits

Author SHA1 Message Date
Marcus Eriksson 012b987e26 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
 2015-08-11 10:11:15 +02:00