honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12802 from jaymode/additional_args 

allow specifying additional arguments in startup-elasticsearch macrodef
This commit is contained in:
Jay Modi 2015-08-11 11:07:47 -04:00
parent abe3880dd9 4da02073ce
commit 8a8ac480dc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/src/main/resources/ant/integration-tests.xml
View File

@ -155,6 +155,7 @@
<attribute name="es.transport.tcp.port" default="${integ.transport.port}"/> <attribute name="es.transport.tcp.port" default="${integ.transport.port}"/>
<attribute name="es.pidfile" default="${integ.pidfile}"/> <attribute name="es.pidfile" default="${integ.pidfile}"/>
<attribute name="jvm.args" default="${tests.jvm.argline}"/> <attribute name="jvm.args" default="${tests.jvm.argline}"/>
<element name="additional-args" optional="true"/>
<sequential> <sequential>
<!-- run bin/elasticsearch with args --> <!-- run bin/elasticsearch with args -->
<echo>Starting up external cluster...</echo> <echo>Starting up external cluster...</echo>
@ -176,6 +177,7 @@
<arg value="-Des.script.inline=on"/> <arg value="-Des.script.inline=on"/>
<arg value="-Des.script.indexed=on"/> <arg value="-Des.script.indexed=on"/>
<arg value="-Des.repositories.url.allowed_urls=http://snapshot.test*"/> <arg value="-Des.repositories.url.allowed_urls=http://snapshot.test*"/>
<additional-args/>
</nested> </nested>
</run-script> </run-script>