Merge branch 'master' into contributor/sravs-dev

arm4b · web-flow · commit 57904d8938dc · 2023-12-13T15:31:15.000Z
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,7 +3,11 @@ Changelog
 
 in development
 --------------
+Fixed
+~~~~~
 
+3.8.1 - December 13, 2023
+-------------------------
 Fixed
 ~~~~~
 * Fix proxy auth mode in HA environments #5766 #6049
diff --git a/lockfiles/st2.lock b/lockfiles/st2.lock
@@ -4009,7 +4009,7 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "c521a3dfc6948a6a57da4dcaa48e0b3390fadcf00d36e3948510cd1c32a10d96",
+              "hash": "29c6ff480b24e4bc316ed69eac5503c71f4700ed17649ae5c5ca8cd745e5852f",
               "url": "git+https://github.com/StackStorm/st2-auth-ldap.git@master"
             }
           ],

Original file line number	Diff line number	Diff line change
`@@ -4009,7 +4009,7 @@`
`4009`	`4009`	`"artifacts": [`
`4010`	`4010`	`{`
`4011`	`4011`	`"algorithm": "sha256",`
`4012`		`- "hash": "c521a3dfc6948a6a57da4dcaa48e0b3390fadcf00d36e3948510cd1c32a10d96",`
	`4012`	`+ "hash": "29c6ff480b24e4bc316ed69eac5503c71f4700ed17649ae5c5ca8cd745e5852f",`
`4013`	`4013`	`"url": "git+https://github.com/StackStorm/st2-auth-ldap.git@master"`
`4014`	`4014`	`}`
`4015`	`4015`	`],`