Brandon Williams 9d0eec2171 Merge branch 'cassandra-1.1' into cassandra-1.2 ... Conflicts: CHANGES.txt		2013-05-21 11:10:47 -05:00
..
avro	Respect 1.0 cache settings as much as possible when upgrading	2012-03-30 23:54:46 +03:00
java/org/apache/cassandra	Merge branch 'cassandra-1.1' into cassandra-1.2	2013-05-21 11:10:47 -05:00
resources/org/apache/cassandra	add nodetool enablebackup/disablebackup	2013-05-13 14:12:19 -04:00