Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt

CHANGES.txt

@@ -17,6 +17,7 @@
  * Fix infinite loop on exception while streaming (CASSANDRA-7330)
  * Reference sstables before populating key cache (CASSANDRA-7234)
 Merged from 1.2:
+ * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
  * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)
  * Track metrics at a keyspace level (CASSANDRA-6539)
  * Add replace_address_first_boot flag to only replace if not bootstrapped

src/java/org/apache/cassandra/gms/Gossiper.java

@@ -704,6 +704,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
     public void resetEndpointStateMap()
     {
         endpointStateMap.clear();
+        unreachableEndpoints.clear();
+        liveEndpoints.clear();
     }
 
     public Set<Entry<InetAddress, EndpointState>> getEndpointStates()