merge from 1.1

CHANGES.txt

@@ -39,6 +39,10 @@
 
 1.1.4
  * fix offline scrub to catch >= out of order rows (CASSANDRA-4411)
+ * fix cassandra-env.sh on RHEL and other non-dash-based systems 
+   (CASSANDRA-4494)
+Merged from 1.0:
+ * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534)
 
 
  * munmap commitlog segments before rename (CASSANDRA-4337)
@@ -67,6 +71,8 @@ Merged from 1.0:
  * Push the validation of secondary index values to the SecondaryIndexManager (CASSANDRA-4240)
  * (Hadoop) fix iterating through a resultset consisting entirely
    of tombstoned rows (CASSANDRA-4466)
+ * allow dropping columns shadowed by not-yet-expired supercolumn or row
+   tombstones in PrecompactedRow (CASSANDRA-4396)
 
 
 1.1.2

build.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+v<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
  ~ Licensed to the Apache Software Foundation (ASF) under one
  ~ or more contributor license agreements.  See the NOTICE file

debian/changelog

@@ -1,3 +1,9 @@
+cassandra (1.1.4) unstable; urgency=low
+
+  * New release
+
+ -- Eric Evans <eevans@apache.org>  Mon, 13 Aug 2012 15:13:20 -0500
+
 cassandra (1.1.3) unstable; urgency=low
 
   * New release

src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java

@@ -531,7 +531,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap
         {
             key.clear();
             key.put(this.getCurrentKey());
-            key.rewind();
+            key.flip();
 
             value.clear();
             value.putAll(this.getCurrentValue());