Merge branch 'cassandra-1.0' into cassandra-1.1

Conflicts:
	.rat-excludes
	build.xml
	debian/changelog

CHANGES.txt

@@ -122,6 +122,18 @@ Merged from 1.0:
  * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
  * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
  * Fix short read protection (CASSANDRA-3934)
+ * Make sure infered and actual schema match (CASSANDRA-3371)
+ * Fix NPE during HH delivery (CASSANDRA-3677)
+ * Don't put boostrapping node in 'hibernate' status (CASSANDRA-3737)
+ * Fix double quotes in windows bat files (CASSANDRA-3744)
+ * Fix bad validator lookup (CASSANDRA-3789)
+ * Fix soft reset in EC2MultiRegionSnitch (CASSANDRA-3835)
+ * Don't leave zombie connections with THSHA thrift server (CASSANDRA-3867)
+ * (cqlsh) fix deserialization of data (CASSANDRA-3874)
+ * Fix removetoken force causing an inconsistent state (CASSANDRA-3876)
+ * Fix ahndling of some types with Pig (CASSANDRA-3886)
+ * Don't allow to drop the system keyspace (CASSANDRA-3759)
+ * Make Pig deletes disabled by default and configurable (CASSANDRA-3628)
 Merged from 0.8:
  * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily
    case (CASSANDRA-3251)

NEWS.txt

@@ -74,6 +74,10 @@ Features
 1.0.8
 =====
 
+Upgrading
+---------
+    - Nothing specific to 1.0.8
+
 Other
 -----
     - Allow configuring socket timeout for streaming

debian/changelog

@@ -4,6 +4,12 @@ cassandra (1.1.0~beta1) unstable; urgency=low
 
  -- Sylvain Lebresne <slebresne@apache.org>  Wed, 15 Feb 2012 16:49:11 +0100
 
+cassandra (1.0.8) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Wed, 22 Feb 2012 15:09:54 +0100
+
 cassandra (1.0.7) unstable; urgency=low
 
   * New release

src/java/org/apache/cassandra/concurrent/Context.java

@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.concurrent;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Context object adding a collection of key/value pairs into ThreadLocalContext.
- */
-
-public class Context
-{
-    private Map<Object, Object> ht_;
-    
-    public Context()
-    {
-        ht_ = new HashMap<Object, Object>();
-    }
-    
-    public Object put(Object key, Object value)
-    {
-        return ht_.put(key, value);
-    }
-    
-    public Object get(Object key)
-    {
-        return ht_.get(key);
-    }
-    
-    public void remove(Object key)
-    {
-        ht_.remove(key);
-    }
-}

src/java/org/apache/cassandra/net/IncomingTcpConnection.java

@@ -98,7 +98,7 @@ public class IncomingTcpConnection extends Thread
             {
                 // save the endpoint so gossip will reconnect to it
                 Gossiper.instance.addSavedEndpoint(from);
-                logger.info("Received " + (isStream ? "streaming " : "") + "connection from newer protocol version. Ignorning");
+                logger.info("Received " + (isStream ? "streaming " : "") + "connection from newer protocol version. Ignoring");
             }
             else if (msg != null)
             {
@@ -160,7 +160,7 @@ public class IncomingTcpConnection extends Thread
             MessagingService.instance().receive(message, id);
             return message;
         }
-        logger.debug("Received connection from newer protocol version {}. Ignorning message", version);
+        logger.debug("Received connection from newer protocol version {}. Ignoring message", version);
         return null;
     }