summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-11-08 17:49:24 +0800
committerMichael Kozono <mkozono@gmail.com>2017-11-09 13:03:42 -0800
commit6925477687acf32fdd6add29cbd9dbacbab04f48 (patch)
treea4112a95de00c139f8f3e557c904b4da72374a3e
parent551c708ce8bbcd98c72c2b86cdcc8006a588215d (diff)
downloadgitlab-ce-6925477687acf32fdd6add29cbd9dbacbab04f48.tar.gz
Update CHANGELOG.md for 10.1.2
[ci skip]
-rw-r--r--CHANGELOG.md4
-rw-r--r--changelogs/unreleased/fix-mysql-grant-check.yml5
2 files changed, 4 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f13eca2caf..685873391eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.1.2 (2017-11-08)
+
+- [FIXED] Fix TRIGGER checks for MySQL.
+
## 10.1.1 (2017-10-31)
- [FIXED] Auto Devops kubernetes default namespace is now correctly built out of gitlab project group-name. !14642 (Mircea Danila Dumitrescu)
diff --git a/changelogs/unreleased/fix-mysql-grant-check.yml b/changelogs/unreleased/fix-mysql-grant-check.yml
deleted file mode 100644
index a1c1aa67d79..00000000000
--- a/changelogs/unreleased/fix-mysql-grant-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix TRIGGER checks for MySQL
-merge_request:
-author:
-type: fixed