merge from 0.6

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

DISCLAIMER.txt

@@ -1,10 +0,0 @@
-Apache Cassandra is an effort undergoing incubation at The ASF, sponsored by the
-Apache Incubator Project Management Committee (PMC).
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.

test/unit/org/apache/cassandra/hadoop/ColumnFamilyInputFormatTest.java

@@ -1,4 +1,25 @@
 package org.apache.cassandra.hadoop;
+/*
+ * 
+ * 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.
+ * 
+ */
+
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;