Merge branch 'master' into feature/query-refactoring

core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java

@@ -71,6 +71,7 @@ public class IndicesCustomDataPathIT extends ESIntegTestCase {
 
     @Test
     @TestLogging("_root:DEBUG,index:TRACE")
+    @AwaitsFix(bugUrl = "path shenanigans, Lee is looking into it")
     public void testDataPathCanBeChanged() throws Exception {
         final String INDEX = "idx";
         Path root = createTempDir();
@@ -140,6 +141,7 @@ public class IndicesCustomDataPathIT extends ESIntegTestCase {
     }
 
     @Test
+    @AwaitsFix(bugUrl = "path shenanigans, Lee is looking into it")
     public void testIndexCreatedWithCustomPathAndTemplate() throws Exception {
         final String INDEX = "myindex2";
         internalCluster().startNodesAsync(1, nodeSettings(path));

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

@@ -173,7 +173,7 @@
           <arg value="-Des.discovery.zen.ping.unicast.enabled=@{es.unicast.enabled}"/>
           <arg value="-Des.discovery.zen.ping.unicast.hosts=@{es.unicast.hosts}"/>
           <arg value="-Des.path.repo=@{home}/repo"/>
-          <arg value="-Des.path.shared_data=@{home}/custom"/>
+          <arg value="-Des.path.shared_data=@{home}/../"/>
           <arg value="-Des.discovery.zen.ping.multicast.enabled=false"/>
           <arg value="-Des.script.inline=on"/>
           <arg value="-Des.script.indexed=on"/>

docs/reference/indices/put-mapping.asciidoc

@@ -70,7 +70,7 @@ In general, the mapping for existing fields cannot be updated.  There are some
 exceptions to this rule. For instance:
 
 * new <<properties>> can be added to <<object>> fields.
-* new <<fields,multi-fields>> can be added to existing fields.
+* new <<multi-fields,multi-fields>> can be added to existing fields.
 * <<doc-values>> can be disabled, but not enabled.
 * the <<ignore-above>> parameter can be updated.