Merge pull request #13 from joshbeard/dev

3.4.0
joshbeard · Dec 14, 2016 · edaf9a5 · edaf9a5
2 parents 106321b + 5055e47
commit edaf9a5
Show file tree

Hide file tree

Showing 40 changed files with 1,607 additions and 810 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,6 +1,6 @@
 fixtures:
   repositories:
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-    staging: "https://github.com/nanliu/puppet-staging.git"
+    staging: "https://github.com/voxpupuli/puppet-staging.git"
   symlinks:
     bamboo: "#{source_dir}"
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ spec/fixtures
 .bundler
 vendor
 Gemfile.lock
+spec/spec_helper_acceptance_local.rb
+spec/spec_helper_local.rb
+Gemfile.local
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--format documentation
+--color