Merge comment-cassandra-1.2 to metrics_cassandra-1.2