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

Fix XPackExtension javadoc (elastic/x-pack-elasticsearch#3711) 

Original commit: elastic/x-pack-elasticsearch@bbe950ce40
This commit is contained in:
Tanguy Leroux 2018-01-24 14:24:39 +01:00 committed by GitHub
parent 3b7d1f4d98
commit ba7b84d4d0
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/core/src/main/java/org/elasticsearch/xpack/core/extensions/XPackExtension.java
View File

@ -43,7 +43,6 @@ public abstract class XPackExtension implements SecurityExtension {
} }
/** /**
<<<<<<< HEAD:plugin/core/src/main/java/org/elasticsearch/xpack/core/extensions/XPackExtension.java
* Returns authentication realm implementations added by this extension. * Returns authentication realm implementations added by this extension.
* *
* The key of the returned {@link Map} is the type name of the realm, and the value * The key of the returned {@link Map} is the type name of the realm, and the value
@ -77,8 +76,6 @@ public abstract class XPackExtension implements SecurityExtension {
} }
/** /**
=======
>>>>>>> master:plugin/core/src/main/java/org/elasticsearch/xpack/extensions/XPackExtension.java
* Returns a list of settings that should be filtered from API calls. In most cases, * Returns a list of settings that should be filtered from API calls. In most cases,
* these settings are sensitive such as passwords. * these settings are sensitive such as passwords.
* *