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 kibana-shield-users 

Original commit: elastic/x-pack-elasticsearch@1a499920e8
This commit is contained in:
Lukas Olson 2016-01-26 10:53:41 -07:00
parent b67af868b3 3fdf9ad390
commit f8dd419c5a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions
View File

@ -82,3 +82,7 @@ cluster:admin/shield/role/add
cluster:admin/shield/role/delete
cluster:admin/shield/role/get
internal:indices/admin/upgrade
cluster:admin/ingest/pipeline/delete
cluster:admin/ingest/pipeline/get
cluster:admin/ingest/pipeline/put
cluster:admin/ingest/pipeline/simulate

2
elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestTestCase.java
View File

@ -58,7 +58,7 @@ public abstract class XPackRestTestCase extends ESRestTestCase {
"test_user:changeme",
url.getHost(),
url.getPort(),
"/_watcher/stop", null, null));
"/_watcher/_stop", null, null));
client.execute(request);
}
}