Conflicts:
	docs/public/clients/java.asciidoc

Original commit: elastic/x-pack-elasticsearch@6478165c72
This commit is contained in:
Paul Echeverri 2014-10-24 15:10:26 -07:00
commit 4dc8a524f5
2 changed files with 9 additions and 4 deletions

View File

@ -1,13 +1,13 @@
admin: admin:
cluster: all cluster: all
indices: indices:
'.*': all '*': all
power_user: power_user:
cluster: monitor cluster: monitor
indices: indices:
'.*': all '*': all
user: user:
indices: indices:
'.*': read '*': read

View File

@ -152,7 +152,12 @@
<build> <build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>