Merge pull request choria-legacy#463 from MikaelSmith/merge-2.10

Merge 2.10.x to 2.11.x
puppetlabs · Oct 26, 2017 · 5c871e3 · 5c871e3
2 parents e90324d + 266d61c
commit 5c871e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/website/changelog.md b/website/changelog.md
@@ -30,6 +30,8 @@ toc: false
 
 |Date|Description|Ticket|
 |----|-----------|------|
+|2017/10/26|Release *2.10.6*||
+|2017/09/25|Restarting the mcollective service no longer kills running agent subprocesses|MCO-816|
 |2017/06/09|Release *2.10.5*||
 |2017/06/07|Fix acceptance source for JDK on Windows|MCO-808|
 |2017/05/11|Release *2.10.4*||

diff --git a/website/releasenotes.md b/website/releasenotes.md
@@ -69,6 +69,17 @@ will be highlighted here.
 |2017/06/21|mcollective-client is now compatible with OpenSSL 1.1.0|MCO-804|
 |2017/06/21|systemu has been upgraded to a more recent version that fixes an issue marshaling multi-byte characters.|MCO-806|
 
+<a name="2_10_6">&nbsp;</a>
+
+## 2.10.6 - 2017/10/26
+
+### Changes since 2.10.5
+
+|Date|Description|Ticket|
+|----|-----------|------|
+|2017/10/26|Release *2.10.6*||
+|2017/09/25|Restarting the mcollective service no longer kills running agent subprocesses|MCO-816|
+
 <a name="2_10_5">&nbsp;</a>
 
 ## 2.10.5 - 2017/06/09