honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Original commit: elastic/x-pack-elasticsearch@989776001b
This commit is contained in:
Khalah Jones Golden 2015-12-10 08:31:50 -04:00
commit 55b12584ed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/handlers
View File

@ -12,10 +12,12 @@ indices:admin/analyze[s]
indices:admin/cache/clear[n]
indices:admin/forcemerge[n]
indices:admin/flush[s]
indices:admin/flush[s][p]
indices:admin/flush[s][r]
indices:admin/mappings/fields/get[index]
indices:admin/mappings/fields/get[index][s]
indices:admin/refresh[s]
indices:admin/refresh[s][p]
indices:admin/refresh[s][r]
indices:admin/upgrade
indices:admin/upgrade[n]
@ -42,8 +44,13 @@ indices:data/read/search[phase/query]
indices:data/read/suggest[s]
indices:data/read/tv[s]
indices:data/write/bulk[s]
indices:data/write/bulk[s][p]
indices:data/write/bulk[s][r]
indices:data/write/delete
indices:data/write/delete[p]
indices:data/write/delete[r]
indices:data/write/index
indices:data/write/index[p]
indices:data/write/index[r]
indices:data/write/update[s]
indices:monitor/recovery[n]

5
elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentParser.java
View File

@ -183,11 +183,6 @@ public class WatcherXContentParser implements XContentParser {
return parser.numberType();
}
@Override
public boolean estimatedNumberType() {
return parser.estimatedNumberType();
}
@Override
public short shortValue(boolean coerce) throws IOException {
return parser.shortValue(coerce);