Merge pull request #13 from puppetlabs/release-3.1.4

(packaging) Prepare 3.1.4 release
puppetlabs · Apr 6, 2017 · 6068bd5561635edd415a8289d984d194d6257f57 · 6068bd5
2 parents 5b071d0 + ad332ad
commit 6068bd5561635edd415a8289d984d194d6257f57
Unified Split

Showing with 7 additions and 1 deletion.

+6 −0 CHANGELOG.md

+1 −1 agent/service.ddl
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@

 Change history for mcollective-service.

+## 3.1.4
+
+Released 2017-04-06
+
+* Support @ as a valid character in service_name (MCOP-588)
+
 ## 3.1.3

 Released 2014-06-18
diff --git a/agent/service.ddl b/agent/service.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "service",
            :description => "Start and stop system services",
            :author      => "R.I.Pienaar",
            :license     => "ASL 2.0",
-            :version     => "3.1.3",
+            :version     => "3.1.4",
            :url         => "http://projects.puppetlabs.com/projects/mcollective-plugins/wiki",
            :timeout     => 60