Skip to content

Commit 71f334c

Browse files
author
Rishav Kumar
committed
resolve conflict
Signed-off-by: Rishav Kumar <[email protected]>
1 parent 6a1fa2c commit 71f334c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1616
* Create a mechanism for plugins to explicitly declare actions they need to perform with their assigned PluginSubject ([#5341](https://github.com/opensearch-project/security/pull/5341))
1717
* Moves OpenSAML jars to a Shadow Jar configuration to facilitate its use in FIPS enabled environments ([#5400](https://github.com/opensearch-project/security/pull/5404))
1818
* Replaced the standard distribution of BouncyCastle with BC-FIPS ([#5439](https://github.com/opensearch-project/security/pull/5439))
19-
* Handle subject in nested claim for JWT auth backends ([#5453](https://github.com/opensearch-project/security/pull/5453))
19+
2020

2121
### Bug Fixes
2222

0 commit comments

Comments
 (0)