Skip to content

G
gitlab-ce
Commit 8d579016 authored by Jarka Kadlecova's avatar Jarka Kadlecova
Browse files
Options

Fix changelog conflict

parent 150faff7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
CHANGELOG.md
View file @ 8d579016
...@@ -4,10 +4,6 @@ entry. ...@@ -4,10 +4,6 @@ entry.
## 10.1.1 (2017-10-31) ## 10.1.1 (2017-10-31)
<<<<<<< HEAD
- No changes.
=======
>>>>>>> ce-com/master
- [FIXED] Auto Devops kubernetes default namespace is now correctly built out of gitlab project group-name. !14642 (Mircea Danila Dumitrescu) - [FIXED] Auto Devops kubernetes default namespace is now correctly built out of gitlab project group-name. !14642 (Mircea Danila Dumitrescu)
- [FIXED] Forbid the usage of `Redis#keys`. !14889 - [FIXED] Forbid the usage of `Redis#keys`. !14889
- [FIXED] Make the circuitbreaker more robust by adding higher thresholds, and multiple access attempts. !14933 - [FIXED] Make the circuitbreaker more robust by adding higher thresholds, and multiple access attempts. !14933
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7