Merge commit 'v0.13.0' into cassandra

Author: Tom May

.gitignore

@@ -2,12 +2,25 @@
 elasticsearch.iws
 .idea/workspace.xml
 work/
+data/
+logs/
 .DS_Store
 build/
 test-output/
 modules/elasticsearch/build/
 modules/test/integration/build/
 modules/test/testng/build/
 modules/benchmark/micro/build/
-plugins/attachments/build
-plugins/groovy/build
+plugins/analysis/icu/build
+plugins/cloud/aws/build
+plugins/hadoop/build
+plugins/lang/groovy/build
+plugins/lang/javascript/build
+plugins/lang/python/build
+plugins/mapper/attachments/build
+plugins/river/couchdb/build
+plugins/river/rabbitmq/build
+plugins/river/twitter/build
+plugins/river/wikipedia/build
+plugins/transport/memcached/build
+plugins/transport/thrift/build

.idea/dictionaries/kimchy.xml

@@ -15,10 +15,10 @@
 #
 #
 # Optionally, exact memory values can be set using the following values, note,
-# they can still be set using the `ES_JAVA_OPTS`.
+# they can still be set using the `ES_JAVA_OPTS`. Sample format include "512m", and "10g".
 #
-#   ES_MIN_MEM   -- The minimum number of memory to allocate, in megabytes.
-#   ES_MAX_MEM   -- The maximum number of memory to allocate, in megabytes.
+#   ES_MIN_MEM   -- The minimum number of memory to allocate.
+#   ES_MAX_MEM   -- The maximum number of memory to allocate.
 #
 # As a convenience, a fragment of shell is sourced in order to set one or
 # more of these variables. This so-called `include' can be placed in a

.idea/gradle.xml

@@ -14,8 +14,13 @@ JAVA_OPTS="$JAVA_OPTS -Xss128k"
 
 JAVA_OPTS="$JAVA_OPTS -Djline.enabled=true"
 
+# Enable aggressive optimizations in the JVM
 JAVA_OPTS="$JAVA_OPTS -XX:+AggressiveOpts"
 
+# Enable reference compression, reducing memory overhead on 64bit JVMs
+#    - Disabled by default as it is not stable for Sun JVM before 6u19
+#JAVA_OPTS="$JAVA_OPTS -XX:+UseCompressedOops"
+
 JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC"
 JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC"
 JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled"