update to upstream release 5.2.0

rgl · Feb 12, 2017 · d621e5d · d621e5d
1 parent e4a1b4b
commit d621e5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 X64?= false
 
-ES_FILE_VERSION=5.1.1
+ES_FILE_VERSION=5.2.0
 ES_VERSION=$(ES_FILE_VERSION)
-ES_SHA1=d4b966c19c85dd2cb9a5b9750193f82f49e63717
+ES_SHA1=243cce802055a06e810fc1939d9f8b22ee68d227
 ES_NAME=elasticsearch-$(ES_VERSION)
 ES_HOME=vendor/$(ES_NAME)
 ES_LIB=$(ES_HOME)/lib

diff --git a/elasticsearchw-update.cmd b/elasticsearchw-update.cmd
@@ -51,9 +51,10 @@ set JVM_OPTIONS=%JVM_OPTIONS% -Dfile.encoding=UTF-8
 REM Use our provided JNA always versus the system one
 set JVM_OPTIONS=%JVM_OPTIONS% -Djna.nosys=true
 
-REM Flags to keep Netty from being unsafe
+REM Flags to configure Netty
 set JVM_OPTIONS=%JVM_OPTIONS% -Dio.netty.noUnsafe=true
 set JVM_OPTIONS=%JVM_OPTIONS% -Dio.netty.noKeySetOptimization=true
+set JVM_OPTIONS=%JVM_OPTIONS% -Dio.netty.recycler.maxCapacityPerThread=0
 
 REM log4j 2
 set JVM_OPTIONS=%JVM_OPTIONS% -Dlog4j.shutdownHookEnabled=false