Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix indices shown in _cat/indices #43286

Merged
merged 12 commits into from
Jun 25, 2019
Merged

Fix indices shown in _cat/indices #43286

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5b4ea1b
Fix indices shown in _cat/indices
tlrx Jun 17, 2019
3c28876
Adapt privileges in MultipleIndicesPermissionsTests
tlrx Jun 18, 2019
99e8170
Adapt privileges in EnableSecurityOnBasicLicenseIT
tlrx Jun 19, 2019
0a7ae0f
Merge branch 'master' into cat-indices
elasticmachine Jun 19, 2019
db151cf
Revert "Adapt privileges in MultipleIndicesPermissionsTests"
tlrx Jun 24, 2019
b02a79c
Revert "Adapt privileges in EnableSecurityOnBasicLicenseIT"
tlrx Jun 24, 2019
9360793
Use Get Settings action instead of Get Indices
tlrx Jun 24, 2019
001b08b
Merge branch 'master' into cat-indices
tlrx Jun 24, 2019
c27246b
Restore randomIndicesStatsResponse
tlrx Jun 24, 2019
4eb76f5
Re-resolve indices
tlrx Jun 25, 2019
ff35567
Wrap listeners
tlrx Jun 25, 2019
d93c087
add comment
tlrx Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/action/ActionModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster) {
registerHandler.accept(new RestMasterAction(settings, restController));
registerHandler.accept(new RestNodesAction(settings, restController));
registerHandler.accept(new RestTasksAction(settings, restController, nodesInCluster));
registerHandler.accept(new RestIndicesAction(settings, restController, indexNameExpressionResolver));
registerHandler.accept(new RestIndicesAction(settings, restController));
registerHandler.accept(new RestSegmentsAction(settings, restController));
// Fully qualified to prevent interference with rest.action.count.RestCountAction
registerHandler.accept(new org.elasticsearch.rest.action.cat.RestCountAction(settings, restController));
Expand Down
Loading