Merge branch 'cassandra-1.2' into cassandra-2.0

CHANGES.txt

@@ -6,6 +6,8 @@
  * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
  * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
  * Add authentication support to shuffle (CASSANDRA-6484)
+Merged from 1.2:
+ * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
 
 
 2.0.8

src/java/org/apache/cassandra/db/ConsistencyLevel.java

@@ -252,6 +252,10 @@ public enum ConsistencyLevel
             case ANY:
                 // local hint is acceptable, and local node is always live
                 break;
+            case LOCAL_ONE:
+                if (countLocalEndpoints(liveEndpoints) == 0)
+                    throw new UnavailableException(this, 1, 0);
+                break;
             case LOCAL_QUORUM:
                 int localLive = countLocalEndpoints(liveEndpoints);
                 if (localLive < blockFor)