Merge 99d0c8a into 5aaede9

voxpupuli · Sep 6, 2018 · 452209f · 452209f
2 parents 5aaede9 + 99d0c8a
commit 452209f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -1,3 +1,3 @@
 ---
 .travis.yml:
-  secure: "ZB12EC//4Z9bp7OVy03loiecq9jg02RxLesGiYq4nnJZkd7KFP//1Rezrox7WjXIYpLaQJ4XIPUyd3LnpE60fXnHDiLUtrw/51x1lgub01tppi8ly8t04AOyPrG1x3GAOJzD2UW9SL02MPYI7uqQdoYm3Kl4CXv++Ji5FGofZFk="
+  secure: "gdyAdrzLWQymKieoE9tB0o3y8Dx+EH0mb6lCK6sgZe3mKGn/gCOEYtiJs2pUNTcHBYGvnSwKu9ajrLBmp4IPJxV2Uc/Wtoj2Dlcb4dV7VHRSA+N/ZYSMNirO/mqwR6ZW94P0mbrwSpYWkx2lxlC9hLvkHdTWBzWajC3i6Khd7h0="
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,7 @@ deploy:
   provider: puppetforge
   user: puppet
   password:
-    secure: "ZB12EC//4Z9bp7OVy03loiecq9jg02RxLesGiYq4nnJZkd7KFP//1Rezrox7WjXIYpLaQJ4XIPUyd3LnpE60fXnHDiLUtrw/51x1lgub01tppi8ly8t04AOyPrG1x3GAOJzD2UW9SL02MPYI7uqQdoYm3Kl4CXv++Ji5FGofZFk="
+    secure: "gdyAdrzLWQymKieoE9tB0o3y8Dx+EH0mb6lCK6sgZe3mKGn/gCOEYtiJs2pUNTcHBYGvnSwKu9ajrLBmp4IPJxV2Uc/Wtoj2Dlcb4dV7VHRSA+N/ZYSMNirO/mqwR6ZW94P0mbrwSpYWkx2lxlC9hLvkHdTWBzWajC3i6Khd7h0="
   on:
     tags: true
     # all_branches is required to use tags

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
-## [v3.1.1](https://github.com/voxpupuli/puppet-mrepo/tree/v3.1.1) (2018-08-15)
+## [v3.1.1](https://github.com/voxpupuli/puppet-mrepo/tree/v3.1.1) (2018-09-06)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-mrepo/compare/v3.1.0...v3.1.1)
 
 **Merged pull requests:**
 
+- allow puppetlabs/stdlib 5.x [\#93](https://github.com/voxpupuli/puppet-mrepo/pull/93) ([bastelfreak](https://github.com/bastelfreak))
 - allow puppet/staging 3.x & puppetlabs/apache 3.x [\#91](https://github.com/voxpupuli/puppet-mrepo/pull/91) ([bastelfreak](https://github.com/bastelfreak))
 - Remove docker nodesets [\#87](https://github.com/voxpupuli/puppet-mrepo/pull/87) ([bastelfreak](https://github.com/bastelfreak))
 - bump puppet to latest supported version 4.10.0 [\#83](https://github.com/voxpupuli/puppet-mrepo/pull/83) ([bastelfreak](https://github.com/bastelfreak))