Skip to content

Commit

Permalink
Merge remote-tracking branch 'ossecurityfork/#2616add-bwcPluginMode-e…
Browse files Browse the repository at this point in the history 
…xtension-setting' into #2616add-bwcPluginMode-extension-setting

# Conflicts:
#	src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
#	src/main/java/org/opensearch/security/auth/SecurityTokenManager.java
  • Loading branch information
@samuelcostae
samuelcostae committed Jul 5, 2023
2 parents 4548a29 + f051397 commit eb54ee9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit eb54ee9

Please sign in to comment.