Skip to content

Commit dbd21ad

Browse files
committed
Update to upstream release 1.4.2.
1 parent 82aad53 commit dbd21ad

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
X64?= false
22

3-
ES_VERSION=1.4.1
3+
ES_VERSION=1.4.2
44
ES_NAME=elasticsearch-$(ES_VERSION)
55
ES_HOME=vendor/$(ES_NAME)
66
ES_LIB=$(ES_HOME)/lib

elasticsearch.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#define ServiceAccountName "elasticsearch"
1212
#define ServiceName "elasticsearch"
13-
#define AppVersion "1.4.1"
13+
#define AppVersion "1.4.2"
1414
#define LuceneVersion "4.10.2"
1515
#define JreVersion "8u25"
1616
#define ESPath "vendor\elasticsearch-" + AppVersion

elasticsearchw-update.cmd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ REM set JVM_OPTIONS=%JVM_OPTIONS% -XX:+AggressiveOpts
2727

2828
REM Enable reference compression, reducing memory overhead on 64bit JVMs
2929
REM - Disabled by default as it is not stable for Sun JVM before 6u19
30+
REM - Enabled by default for JVM 6u23+ when JVM_MX < 32GB
3031
REM set JVM_OPTIONS=%JVM_OPTIONS% -XX:+UseCompressedOops
3132

3233
set JVM_OPTIONS=%JVM_OPTIONS% -XX:+UseParNewGC
@@ -53,7 +54,10 @@ REM space for a full heap dump.
5354
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:HeapDumpPath=$ES_HOME/logs/heapdump.hprof
5455

5556
REM Disables explicit GC
56-
set JAVA_OPTS=%JAVA_OPTS% -XX:+DisableExplicitGC
57+
set JVM_OPTIONS=%JVM_OPTIONS% -XX:+DisableExplicitGC
58+
59+
REM Ensure UTF-8 encoding by default (e.g. filenames)
60+
set JVM_OPTIONS=%JVM_OPTIONS% -Dfile.encoding=UTF-8
5761

5862
set JVM_CLASSPATH=%ES_LIB%\*;%ES_LIB%\sigar\*
5963

vendor/elasticsearch-1.4.1.zip.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/elasticsearch-1.4.2.zip.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7d378176827a965eea9fb5f2d79681c4 *elasticsearch-1.4.2.zip

0 commit comments

Comments
 (0)