FUCK YOU GIT

Squashed commit of the following:

commit 9e1eee30eca33e96fc0010300331207ae609a825
Author: Robert Muir <rmuir@apache.org>
Date:   Thu Aug 6 06:11:15 2015 -0400

    fix shield integration tests with master changes

    TODO: this all needs cleanup

commit elastic/x-pack@098f8994a6
Author: debadair <deb.adair@elasticsearch.com>
Date:   Wed Aug 5 13:09:17 2015 -0700

    Added missing description and edited the table.

commit elastic/x-pack@f1782adb40
Author: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date:   Wed Jul 15 14:08:27 2015 +0200

    There is no need to check if the primary shards of the history indices are started, since we don't load watch records any more during the Watcher startup process.

commit elastic/x-pack@689fdcd00b
Author: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date:   Fri Jul 17 22:44:52 2015 +0200

    Use custom metadata to remember that Watcher stopped via an explicit stop api call.

    Also expose WatcherMetaData in stats api

commit elastic/x-pack@abaa42d608
Author: Tanguy Leroux <tlrx.dev@gmail.com>
Date:   Wed Aug 5 11:31:42 2015 +0200

    Marvel: Add Cluster Stats timeout

commit elastic/x-pack@1be4701a4b
Author: uboness <uboness@gmail.com>
Date:   Wed Aug 5 00:20:05 2015 +0200

    [watcher] Remove default timezone usage

    Closes elastic/elasticsearch#387

commit elastic/x-pack@88f588d97b
Merge: elastic/x-pack@c49a303 elastic/x-pack@bb12e9a
Author: Robert Muir <rcmuir@gmail.com>
Date:   Tue Aug 4 17:11:52 2015 -0400

    Merge pull request elastic/elasticsearch#386 from rmuir/shield_integ_update

    adapt shield to integration tests changes

commit elastic/x-pack@bb12e9aa8d
Author: Robert Muir <rmuir@apache.org>
Date:   Tue Aug 4 16:17:23 2015 -0400

    adapt shield to integration tests changes

    we don't use ports 9200/9300 by default for integration tests anymore.
    they easily conflict with the user running/debugging es on their machine.

Original commit: elastic/x-pack-elasticsearch@17a474df2c

shield/dev-tools/integration-tests.xml

@@ -3,7 +3,20 @@
 
   <import file="${elasticsearch.integ.antfile.default}"/>
 
+  <property name="integ.args" value="
+-Des.cluster.name=${integ.cluster.name}
+-Des.http.port=${integ.http.port}
+-Des.transport.tcp.port=${integ.transport.port}
+-Des.pidfile=${integ.pidfile}
+-Des.discovery.zen.ping.multicast.enabled=false
+-Des.script.inline=on
+-Des.script.indexed=on
+-Des.repositories.url.allowed_urls=http://snapshot.test*
+  "/>
+
+
   <!-- TODO shield redefines this because the wait for http will fail due to auth -->
+  <!-- TODO: remove this, its really fragile as shit -->
   <macrodef name="startup-elasticsearch">
     <attribute name="home" default="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
     <attribute name="args" default="${integ.args}"/>
@@ -13,16 +26,16 @@
                   args="@{args} -Des.path.repo=@{home}/repo" />
 
       <waitfor maxwait="3" maxwaitunit="minute" checkevery="500">
-        <socket server="127.0.0.1" port="9200"/>
+        <socket server="127.0.0.1" port="${integ.http.port}"/>
       </waitfor>
 
       <local name="integ.pid"/>
-      <extract-pid property="integ.pid"/>
+      <extract-pid file="${integ.pidfile}" property="integ.pid"/>
       <echo>External cluster started PID ${integ.pid}</echo>
     </sequential>
   </macrodef>
 
-  <target name="start-external-cluster-with-plugin" depends="setup-workspace" unless="${shouldskip}">
+  <target name="start-external-cluster-with-plugin" depends="setup-workspace">
     <local name="home"/>
     <property name="home" location="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
     <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-license-plugin-${project.version}.zip" />
@@ -32,6 +45,6 @@
 
     <local name="temp.file"/>
     <tempfile property="temp.file" destdir="${java.io.tmpdir}"/>
-    <get src="http://127.0.0.1:9200" dest="${temp.file}" username="test_user" password="changeme" verbose="true" retries="10"/>
+    <get src="http://127.0.0.1:${integ.http.port}" dest="${temp.file}" username="test_user" password="changeme" verbose="true" retries="10"/>
   </target>
 </project>