Merge branch 'master' into MODULES-1014/add-noop-mode

5 files changed, 100 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 44e004c..b5fe773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ coverage
 \#*
 Gemfile.lock
 log
+.vagrant
 
 #Intellij
 .idea
diff --git a/CHANGELOG b/CHANGELOG
index 8142f5d..812a2c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,29 @@
+2014-06-04 - Version 1.0.0
+
+Summary:
+
+This release focuses on a number of bugfixes, and also has some
+new features for Bzr and Git.
+
+Features:
+- Bzr:
+ - Call set_ownership
+- Git:
+ - Add ability for shallow clones
+ - Use -a and desired for HARD resets
+ - Use rev-parse to get tag canonical revision
+
+Fixes:
+- HG:
+ - Only add ssh options when it's talking to the network
+- Git:
+ - Fix for issue with detached HEAD
+ - force => true will now destroy and recreate repo
+ - Actually use the remote parameter
+ - Use origin/master instead of origin/HEAD when on master
+- SVN:
+ - Fix svnlook behavior with plain directories
+
 2013-11-13 - Version 0.2.0
 
 Summary:
diff --git a/Gemfile b/Gemfile
index 2fcc822..0120ece 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,8 +7,8 @@ group :development, :test do
   gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
+  gem 'beaker-rspec', '~>2.2',   :require => false
+  gem 'rspec', '~>2.14',         :require => false
   gem 'simplecov',               :require => false
 end
 
diff --git a/Modulefile b/Modulefile
index d2bbe92..8a468ab 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,4 +1,4 @@
-name 'puppetlabs/vcsrepo'
-version '0.2.0'
+name 'puppetlabs-vcsrepo'
+version '1.0.0'
 summary 'Manage repositories from various version control systems'
 description 'Manage repositories from various version control systems'
diff --git a/metadata.json b/metadata.json
new file mode 100644
index 0000000..c9a139e
--- /dev/null
+++ b/metadata.json
@@ -0,0 +1,69 @@
+{
+    "name": "puppetlabs-vcsrepo",
+    "version": "1.0.0",
+    "source": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
+    "author": "Puppet Labs",
+    "license": "GPLv2",
+    "project_page": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
+    "summary": "Puppet module providing a type to manage repositories from various version control systems",
+    "operatingsystem_support": [
+      {
+        "operatingsystem": "RedHat",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "CentOS",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "OracleLinux",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "Scientific",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "SLES",
+        "operatingsystemrelease": [
+          "11 SP1"
+        ]
+      },
+      {
+        "operatingsystem": "Debian",
+        "operatingsystemrelease": [
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "Ubuntu",
+        "operatingsystemrelease": [
+          "10.04",
+          "12.04",
+          "14.04"
+        ]
+      }
+    ],
+    "requirements": [
+      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
+      { "name": "puppet", "version_requirement": "3.x" }
+    ],
+    "dependencies": []
+}