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

Remove nocommit from Security 

This commit removes a nocommit from Security so that work can continue.

Original commit: elastic/x-pack-elasticsearch@4d35ef6174
This commit is contained in:
Jason Tedor 2016-08-02 17:11:14 -04:00
parent c88aea19d8
commit 8579dbf80b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/Security.java
View File

@ -350,7 +350,6 @@ public class Security implements ActionPlugin, IngestPlugin {
settingsBuilder.put(NetworkModule.TRANSPORT_TYPE_KEY, Security.NAME + "4"); settingsBuilder.put(NetworkModule.TRANSPORT_TYPE_KEY, Security.NAME + "4");
settingsBuilder.put(NetworkModule.TRANSPORT_SERVICE_TYPE_KEY, Security.NAME); settingsBuilder.put(NetworkModule.TRANSPORT_SERVICE_TYPE_KEY, Security.NAME);
settingsBuilder.put(NetworkModule.HTTP_TYPE_SETTING.getKey(), Security.NAME + "4"); settingsBuilder.put(NetworkModule.HTTP_TYPE_SETTING.getKey(), Security.NAME + "4");
// nocommit
SecurityNetty4HttpServerTransport.overrideSettings(settingsBuilder, settings); SecurityNetty4HttpServerTransport.overrideSettings(settingsBuilder, settings);
addUserSettings(settings, settingsBuilder); addUserSettings(settings, settingsBuilder);
addTribeSettings(settings, settingsBuilder); addTribeSettings(settings, settingsBuilder);