ninja fix cassandra.yaml missing memtable_(off)?heap_size_in_mb
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk