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

Merge pull request #7734 from docker/ucp-relnotes-fix 

Removed merge conflict in UCP release notes
This commit is contained in:
Anne Henmi 2018-11-27 09:54:30 -07:00 committed by GitHub
parent d02cc95e00 fc9490a8e2
commit ca55b0cec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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