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

Removed merge conflict.

This commit is contained in:
Anne Henmi 2018-11-21 08:45:30 -07:00
parent 3840f1b232
commit fc9490a8e2
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ee/ucp/release-notes.md
View File

@ -421,7 +421,6 @@ deprecated. Deploy your applications as Swarm services or Kubernetes workloads.
**Bug fixes**
<<<<<<< HEAD
* Core
* Resolved an issue where LDAP sync jobs terminated when processing an org admin
Search result that does not resolve to an existing user. (docker/escalation#784 #docker/escalation#888)
@ -429,7 +428,6 @@ deprecated. Deploy your applications as Swarm services or Kubernetes workloads.
* UI
* Fixed an issue that caused "Per User Limit" to not work on Admin Settings. (docker/escalation#639)
=======
* Core
* Resolved an issue where LDAP sync jobs would crash when handling an org admin search result which does not correspond to an existing user. (docker/escalation#784 #docker/escalation#888)
* Fixed an issue that caused RethinkDB client lock contention. (docker/escalation#902 and docker/escalation#906)
@ -444,7 +442,6 @@ deprecated. Deploy your applications as Swarm services or Kubernetes workloads.
* Security
* Fixed a critical security issue to prevent UCP from accepting certificates from
the system pool when adding client CAs to the server that requires mutual authentication.
>>>>>>> ba65aeabbb67b4cc2464497cfbe8bbccec8aacb2
## Version 2.2.12 (2018-08-09)