summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Jen <bryan.jen@gmail.com>2015-07-30 16:25:48 -0700
committerBryan Jen <bryan.jen@gmail.com>2015-07-30 16:25:48 -0700
commit266b20510b9eec7e8e91096f5aa370ae52a136e7 (patch)
treeeba5c00e860b9df95a4a682f1a9134fab8b84486
parent231f711e3f0ccb8601bea55f0e6d562b8674488e (diff)
parent56d55ee4426ddcbcf568d5b413ed780812738657 (diff)
Merge pull request #259 from mhaskel/merge_1.3.x_to_master
Merge 1.3.x to master
-rw-r--r--CHANGELOG.md11
-rw-r--r--metadata.json12
2 files changed, 17 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad10e97..7d1060c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
# Change Log
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
+## [1.3.1] - 2015-07-28 Supported Release
+###Summary
+This release includes a number of bugfixes along with some test updates.
+
+### Fixed
+- Fix for detached HEAD on git 2.4+
+- Git provider doesn't ignore revision property when depth is used (MODULES-2131)
+- Test fixes
+- Check if submodules == true before calling update_submodules
+
## [1.3.0] - 2015-05-19 Supported Release
### Summary
This release adds git provider remote handling, svn conflict resolution, and fixes the git provider when /tmp is mounted noexec.
@@ -125,6 +135,7 @@ our many contributors for all of these fixes!
- CVS:
- Documented the "module" attribute.
+[1.3.1]: https://github.com/puppetlabs/puppetlabs-vcsrepo/compare/1.3.0...1.3.1
[1.3.0]: https://github.com/puppetlabs/puppetlabs-vcsrepo/compare/1.2.0...1.3.0
[1.2.0]: https://github.com/puppetlabs/puppetlabs-vcsrepo/compare/1.1.0...1.2.0
[1.1.0]: https://github.com/puppetlabs/puppetlabs-vcsrepo/compare/1.0.2...1.1.0
diff --git a/metadata.json b/metadata.json
index ef74e86..1552840 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,15 @@
{
"name": "puppetlabs-vcsrepo",
- "version": "1.3.0",
+ "version": "1.3.1",
"author": "Puppet Labs",
"summary": "Puppet module providing a type to manage repositories from various version control systems",
"license": "GPLv2",
"source": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
"project_page": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+ "dependencies": [
+
+ ],
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
@@ -67,14 +70,11 @@
"requirements": [
{
"name": "pe",
- "version_requirement": "3.x"
+ "version_requirement": ">= 3.0.0 < 2015.3.0"
},
{
"name": "puppet",
- "version_requirement": "3.x"
+ "version_requirement": ">= 3.0.0 < 5.0.0"
}
- ],
- "dependencies": [
-
]
}