Merge pull request #467 from MikaelSmith/release-prep

(docs) Prepare for 2.12.0 release
choria-io · Feb 20, 2018 · ce4b7db · ce4b7db
2 parents fba0a89 + ba19bcb
commit ce4b7db
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/website/changelog.md b/website/changelog.md
@@ -4,6 +4,16 @@ title: Changelog
 toc: false
 ---
 
+## Version 2.12.x
+
+|Date|Description|Ticket|
+|----|-----------|------|
+|2017/09/22|Allow default batch options to be set|MCO-818|
+|2017/09/18|Use native array math to calculate responses more quickly|MCO-818|
+|2017/08/02|Correctly determine reply status with JSON serializer|MCO-815|
+|2017/06/16|Update stomp gem to 1.4.4 to fix SSL||
+|2017/06/07|Update rubocop/securitycop scans and convert YAML.load to safe_load for facts|MCO-807|
+
 ## Version 2.11.x
 
 |Date|Description|Ticket|

diff --git a/website/releasenotes.md b/website/releasenotes.md
@@ -8,7 +8,21 @@ This is a list of release notes for various releases, you should review these
 before upgrading as any potential problems and backward incompatible changes
 will be highlighted here.
 
-<a name="2_11.4">&nbsp;</a>
+<a name="2_12_0">&nbsp;</a>
+
+## 2.12.0 - 2017/03/20
+
+### Changes since 2.11.4
+
+|Date|Description|Ticket|
+|----|-----------|------|
+|2017/09/22|Allow default batch options to be set|MCO-818|
+|2017/09/18|Use native array math to calculate responses more quickly|MCO-818|
+|2017/08/02|Correctly determine reply status with JSON serializer|MCO-815|
+|2017/06/16|Update stomp gem to 1.4.4 to fix SSL||
+|2017/06/07|Update rubocop/securitycop scans and convert YAML.load to safe_load for facts|MCO-807|
+
+<a name="2_11_4">&nbsp;</a>
 
 ## 2.11.4 - 2017/10/26