Merge remote-tracking branch 'origin/w/1.1/improvement/update-cve-201…

…8-1002105' into w/1.2/improvement/update-cve-2018-1002105 * origin/w/1.1/improvement/update-cve-2018-1002105: Update Kubernetes version to 1.10.11 Conflicts: ChangeLog.rst
scality · Dec 6, 2018 · 08e1b83 · 08e1b83
2 parents e5e125d + 23ec176
commit 08e1b83
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -57,6 +57,9 @@ the index provisioning job (:ghpull:`233`).
 
 Release 1.0.1 (in development)
 ==============================
+This version updates the Kubernetes version to 1.10.11 to handle
+CVE-2018-100210.
+
 Features added
 --------------
 :ghpull:`232` - Add more storage checks regarding the device presence and the
@@ -92,6 +95,7 @@ capital letters
 
 :ghpull:`472` - update Python `requests` library version
 
+:ghpull:`511` - update Kubernetes version to 1.10.11 to include a fix for CVE-2018-100210
 
 Release 1.0.0
 =============