merge from 0.8

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

CHANGES.txt

@@ -17,6 +17,7 @@
  * Allow using quotes in "USE <keyspace>;" CLI command (CASSANDRA-3208)
  * Don't allow any cache loading exceptions to halt startup (CASSANDRA-3218)
  * Fix sstableloader --ignores option (CASSANDRA-3247)
+ * File descriptor limit increased in packaging (CASSANDRA-3206)
 
 
 1.0.0-beta1

NEWS.txt

@@ -204,7 +204,7 @@ Features
     - optional intranode encryption; see comments around 'encryption_options'
       in cassandra.yaml
     - compaction multithreading and rate-limiting; see 
-      'compaction_multithreading' and 'compaction_throughput_mb_per_sec' in
+      'concurrent_compactors' and 'compaction_throughput_mb_per_sec' in
       cassandra.yaml
     - cassandra will limit total memtable memory usage to 1/3 of the heap
       by default.  This can be ajusted or disabled with the 

debian/cassandra.conf

@@ -1,2 +1,3 @@
 # Provided by the cassandra package
 cassandra  -  memlock  unlimited
+cassandra  -  nofile   100000

debian/init

@@ -22,6 +22,7 @@ CONFDIR=/etc/cassandra
 JSVC=/usr/bin/jsvc
 WAIT_FOR_START=10
 CASSANDRA_HOME=/usr/share/cassandra
+FD_LIMIT=100000
 
 # The first existing directory is used for JAVA_HOME if needed.
 JVM_SEARCH_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun"
@@ -127,6 +128,7 @@ do_start()
     is_running && return 1
 
     ulimit -l unlimited
+    ulimit -n "$FD_LIMIT"
 
     cassandra_home=`getent passwd cassandra | awk -F ':' '{ print $6; }'`
     cd /    # jsvc doesn't chdir() for us

redhat/cassandra.conf

@@ -1 +1,2 @@
 cassandra   -   memlock     unlimited
+cassandra   -   nofile      100000