merge from 0.8.1

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1101777 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -56,6 +56,8 @@
  * improve ignoring of obsolete mutations in index maintenance (CASSANDRA-2401)
  * recognize attempt to drop just the index while leaving the column
    definition alone (CASSANDRA-2619)
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
 
 
 0.8.0-beta1

src/java/org/apache/cassandra/service/StorageService.java

@@ -458,7 +458,12 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
                 bootstrap(token);
                 assert !isBootstrapMode; // bootstrap will block until finished
             }
-            // else nothing to do, go directly to participating in ring
+            else
+            {
+                // nothing to bootstrap, go directly to participating in ring
+                SystemTable.setBootstrapped(true);
+                setToken(token);
+            }
         }
         else
         {