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

Merge branch 'master' into feature/query-refactoring

This commit is contained in:
Christoph Büscher 2015-08-12 23:52:15 +02:00
parent e3fc6a0f7e 0cb3e21a3e
commit 397a4305ad
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java
View File

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

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

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

2
docs/reference/indices/put-mapping.asciidoc
View File

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