puppet_vcsrepo.git
5 years ago(maint) allow setting PUPPET_VERSION in acceptance
Justin Stoller [Tue, 9 Jun 2015 05:32:54 +0000 (22:32 -0700)]
(maint) allow setting PUPPET_VERSION in acceptance

5 years agoMerge pull request #232 from netors/master
David Schmitt [Thu, 28 May 2015 17:48:40 +0000 (18:48 +0100)]
Merge pull request #232 from netors/master

Consider the submodules flag on specific revision cloning

5 years agoAdd ability to unittest puppet 4
Hunter Haugen [Wed, 27 May 2015 15:15:02 +0000 (08:15 -0700)]
Add ability to unittest puppet 4

5 years agoMerge pull request #251 from mhaskel/merge_1.3.x_to_master
Bryan Jen [Thu, 21 May 2015 19:50:20 +0000 (12:50 -0700)]
Merge pull request #251 from mhaskel/merge_1.3.x_to_master

Merge 1.3.x to master

5 years agoMerge branch 'psoloway-readme' into 1.3.x
Morgan Haskel [Mon, 18 May 2015 21:17:11 +0000 (14:17 -0700)]
Merge branch 'psoloway-readme' into 1.3.x

5 years agoLast-minute README corrections
Pete Soloway [Mon, 18 May 2015 20:18:36 +0000 (13:18 -0700)]
Last-minute README corrections

* Corrected the list of supported platforms under Limitations
* Spelled “revision spec” instead of “revisionspec”.

5 years agoMerge pull request #249 from hunner/release_1.3.0
Morgan Haskel [Wed, 13 May 2015 23:39:14 +0000 (16:39 -0700)]
Merge pull request #249 from hunner/release_1.3.0

Release 1.3.0

5 years agoRelease 1.3.0
Hunter Haugen [Wed, 13 May 2015 23:34:37 +0000 (16:34 -0700)]
Release 1.3.0

5 years agoMerge pull request #246 from psoloway/readme
Hunter Haugen [Wed, 13 May 2015 23:30:45 +0000 (16:30 -0700)]
Merge pull request #246 from psoloway/readme

Update README per DOC-1501

5 years agoMerge pull request #248 from hunner/fix_tmp
Morgan Haskel [Wed, 13 May 2015 22:50:12 +0000 (15:50 -0700)]
Merge pull request #248 from hunner/fix_tmp

(MODULES-821) Don't use /tmp

5 years ago(MODULES-821) Don't use /tmp
Hunter Haugen [Wed, 13 May 2015 22:39:01 +0000 (15:39 -0700)]
(MODULES-821) Don't use /tmp

Very often /tmp is mounted noexec for security reasons related to it
being writable by all users. This stopped vcsrepo's git provider from
working.

This pull request uses puppet's statedir as it is not writable by all
users and is a good candidate for transient state like the git
provider's identity script for the $GIT_SSH command.

An alternative in the future that wouldn't require a temporary file is
to set $GIT_SSH_COMMAND instead of $GIT_SSH, except this was added in
git 2.3 and is too new to depend on.

5 years agoMerge pull request #247 from puppetlabs/modulesync_updates
Travis Fields [Thu, 7 May 2015 19:00:17 +0000 (12:00 -0700)]
Merge pull request #247 from puppetlabs/modulesync_updates

Modulesync updates

5 years agobeaker gemfile fixes
Morgan Haskel [Wed, 6 May 2015 21:33:11 +0000 (14:33 -0700)]
beaker gemfile fixes

5 years agosync via modulesync
Morgan Haskel [Wed, 6 May 2015 21:31:22 +0000 (14:31 -0700)]
sync via modulesync

5 years agosync via modulesync
Morgan Haskel [Wed, 6 May 2015 21:10:46 +0000 (14:10 -0700)]
sync via modulesync

5 years agoMerge pull request #241 from tykeal/master
TP Honey [Wed, 22 Apr 2015 16:20:10 +0000 (17:20 +0100)]
Merge pull request #241 from tykeal/master

Clean up puppet lint warnings

5 years agoMerge pull request #237 from cmurphy/rspec-puppet-2
TP Honey [Wed, 22 Apr 2015 16:19:08 +0000 (17:19 +0100)]
Merge pull request #237 from cmurphy/rspec-puppet-2

Testing updates

5 years agoMerge upstream changes into readme branch
Pete Soloway [Tue, 21 Apr 2015 20:56:15 +0000 (13:56 -0700)]
Merge upstream changes into readme branch

5 years agoUpdate README per DOC-1501
Pete Soloway [Tue, 7 Apr 2015 16:56:10 +0000 (09:56 -0700)]
Update README per DOC-1501

1. Remove any "what this affects" sections, except where particularly warranted.
2. Make sure that for each parameter, where applicable, there is a data type and a default value.
3. Make sure that for each parameter that's applicable, there is a note if the parameter is optional.
4. Make sure the links in the README work and are accurate.
5. Update the link in the Contributing section to point here: https://docs.puppetlabs.com/forge/contributing.html
6. General copyediting.

5 years agoMerge pull request #224 from puppet-by-examples/single-branch
TP Honey [Tue, 21 Apr 2015 09:01:39 +0000 (10:01 +0100)]
Merge pull request #224 from puppet-by-examples/single-branch

Shallow clone with one commit that corresponds to arbitrary tag from arbitrary branch

5 years agoMerge pull request #243 from rnelson0/quotes
Morgan Haskel [Thu, 16 Apr 2015 17:15:29 +0000 (10:15 -0700)]
Merge pull request #243 from rnelson0/quotes

Enforce the style guide's recommendation of single quotes as the default.

5 years agoEnforce the style guide's recommendation of single quotes as the default.
Rob Nelson [Tue, 14 Apr 2015 21:29:37 +0000 (21:29 +0000)]
Enforce the style guide's recommendation of single quotes as the default.

5 years agoClean up puppet lint warnings
Andrew Grimberg [Mon, 6 Apr 2015 19:23:22 +0000 (12:23 -0700)]
Clean up puppet lint warnings

There were puppet lint warnings due to indentation in several examples.
This commit cleans up the warnings.

Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
5 years agoMerge pull request #220 from ddisisto/1.2.x_add_svn_accept
TP Honey [Mon, 30 Mar 2015 09:36:42 +0000 (10:36 +0100)]
Merge pull request #220 from ddisisto/1.2.x_add_svn_accept

Add support for 'conflict' parameter to populate svn --accept arg

5 years agoMerge pull request #238 from anodelman/master
Justin Stoller [Fri, 27 Mar 2015 00:00:26 +0000 (17:00 -0700)]
Merge pull request #238 from anodelman/master

(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...

5 years agoMerge pull request #240 from cmurphy/hash_ordering
Bryan Jen [Thu, 26 Mar 2015 20:33:25 +0000 (13:33 -0700)]
Merge pull request #240 from cmurphy/hash_ordering

Fix remote hash ordering for unit tests

5 years agoFix remote hash ordering for unit tests
Colleen Murphy [Wed, 25 Mar 2015 19:04:16 +0000 (12:04 -0700)]
Fix remote hash ordering for unit tests

Without this commit, the unit tests for the git provider changing
multiple remotes mocks the remotes in a particular order. While in
practice it doesn't matter which remote the update_remotes method
updates first, the unit tests must be able to mock them in the correct
order. For ruby 1.8.7, a Hash will not necessarily produce key value
pairs in the same order on each run, which causes intermittent failures
in the unit tests. This change sorts the :source property values before
trying to update them, and updates the unit tests to expect the values
in alphabetical order.

5 years ago(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
Alice Nodelman [Tue, 24 Mar 2015 22:11:45 +0000 (15:11 -0700)]
(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...

puppetdb, etc

- support for BEAKER_VERSION and BEAKER_RSPEC_VERSION in gemfile

5 years agoUpdate .travis.yml
Colleen Murphy [Mon, 23 Mar 2015 19:30:36 +0000 (12:30 -0700)]
Update .travis.yml

This commit makes the following changes to the test matrix:

- Runs tests on ruby 2.1.5 instead of 2.0.0
- Runs tests on ruby 1.8.7 with puppet 3.x
- Adds an environment to run on an intermediate 3.x puppet version
  instead of latest (specifically 3.4.x)
- Adds an environment to run with the future parser on latest puppet.
  This would affect the test runs for the validate and spec checks.
- Runs the tests on docker

5 years agoKeep testing on puppet 2.7
Colleen Murphy [Mon, 23 Mar 2015 19:04:20 +0000 (12:04 -0700)]
Keep testing on puppet 2.7

The modulesync config repo is dropping universal support for puppet
2.7, but individual repos should still keep support until the next
naturally-occuring major release.

5 years agoUnpin rspec-puppet and remove unneeded deps
Colleen Murphy [Thu, 19 Mar 2015 23:22:07 +0000 (16:22 -0700)]
Unpin rspec-puppet and remove unneeded deps

puppetlabs_spec_helper takes care of these for us.

5 years ago(MODULES-1551) Add support for SVN conflict handling
Daniel DiSisto [Fri, 6 Mar 2015 06:01:38 +0000 (17:01 +1100)]
(MODULES-1551) Add support for SVN conflict handling

5 years agoMerge pull request #236 from dummey/master
TP Honey [Mon, 2 Mar 2015 14:12:05 +0000 (14:12 +0000)]
Merge pull request #236 from dummey/master

Updating 'excludes' in readme to be more concise.

5 years agoUpdate README.markdown
Ricky Ng [Thu, 12 Feb 2015 20:49:41 +0000 (14:49 -0600)]
Update README.markdown

Clarified what the parameter 'excludes' is intended to do.

5 years agoMerge pull request #235 from cmurphy/rspec
Hunter Haugen [Wed, 4 Feb 2015 20:05:04 +0000 (12:05 -0800)]
Merge pull request #235 from cmurphy/rspec

Pin rspec gems

5 years agoPin rspec gems
Colleen Murphy [Wed, 4 Feb 2015 16:00:39 +0000 (17:00 +0100)]
Pin rspec gems

5 years agoBugfix: removed duplicated condition
Ernesto Ruy Sanchez [Fri, 30 Jan 2015 19:01:01 +0000 (11:01 -0800)]
Bugfix: removed duplicated condition

5 years agoAdded submodules true condition before update_submodules on revision method
Ernesto Ruy Sanchez [Fri, 30 Jan 2015 18:46:59 +0000 (10:46 -0800)]
Added submodules true condition before update_submodules on revision method

5 years agoUse branch parameter
Włodzimierz Gajda [Wed, 22 Oct 2014 08:02:29 +0000 (10:02 +0200)]
Use branch parameter

5 years agoMerge pull request #230 from jonnytpuppet/multiple_remotes
Hunter Haugen [Thu, 22 Jan 2015 19:09:23 +0000 (11:09 -0800)]
Merge pull request #230 from jonnytpuppet/multiple_remotes

Implemented multiple remotes feature for git provider.

5 years agoImplemented multiple remotes feature for git provider.
Jonathan Tripathy [Wed, 21 Jan 2015 07:12:20 +0000 (23:12 -0800)]
Implemented multiple remotes feature for git provider.

5 years agoMerge pull request #218 from dduvnjak/master
Aaron Stone [Mon, 19 Jan 2015 05:43:27 +0000 (21:43 -0800)]
Merge pull request #218 from dduvnjak/master

Add submodules feature to git provider

5 years agoAdd submodules feature to git provider
dduvnjak [Sun, 18 Jan 2015 09:49:03 +0000 (10:49 +0100)]
Add submodules feature to git provider

5 years agoMerge pull request #229 from hunner/update_before
Colleen Murphy [Wed, 14 Jan 2015 16:56:50 +0000 (08:56 -0800)]
Merge pull request #229 from hunner/update_before

Update let to use instance variable instead.

5 years agoRemove let use as variable.
Hunter Haugen [Wed, 14 Jan 2015 16:47:57 +0000 (08:47 -0800)]
Remove let use as variable.

Since lets can't be used in before :all any more.

5 years agoMerge pull request #228 from tphoney/removing_private_tests
Hunter Haugen [Wed, 14 Jan 2015 01:16:05 +0000 (17:16 -0800)]
Merge pull request #228 from tphoney/removing_private_tests

removing private tests

5 years agoremoving private tests
tphoney [Wed, 14 Jan 2015 01:06:45 +0000 (17:06 -0800)]
removing private tests

removing private tests, due to rspec3 not handling private methods

5 years agoMerge pull request #226 from cmurphy/master
Morgan Haskel [Mon, 29 Dec 2014 19:22:00 +0000 (11:22 -0800)]
Merge pull request #226 from cmurphy/master

Add IntelliJ files to the ignore list

5 years agoAdd IntelliJ files to the ignore list
Colleen Murphy [Mon, 29 Dec 2014 18:41:26 +0000 (10:41 -0800)]
Add IntelliJ files to the ignore list

5 years agoMerge pull request #225 from mhaskel/MODULES-1596
Travis Fields [Sat, 27 Dec 2014 00:00:09 +0000 (16:00 -0800)]
Merge pull request #225 from mhaskel/MODULES-1596

MODULES-1596 - Repository repeatedly destroyed/created with force

5 years agoMODULES-1596 - Repository repeatedly destroyed/created with force
Morgan Haskel [Fri, 26 Dec 2014 23:27:20 +0000 (15:27 -0800)]
MODULES-1596 - Repository repeatedly destroyed/created with force

The `retrieve` method was calling `create` and `destroy` on every run
with `force => true`. Retrieve should not be making any changes to the
system, so removed that code, and updated `working_copy_exists` to make
sure that the directory not only contains a `.git` directory, but also
if `source` is specified it also matches `#{path}/.git/config` so that
it will overwrite a git repo with a different source.

Updated tests to not check for the old broken behavior. Added a regression test.

5 years agoMerge pull request #223 from infopro-digital/MODULES-1597
Aaron Stone [Tue, 16 Dec 2014 20:02:54 +0000 (12:02 -0800)]
Merge pull request #223 from infopro-digital/MODULES-1597

Fix for MODULES-1597: "format" is a file not a directory

5 years agoFix for MODULES-1597: "format" is a file not a directory
Farzad FARID [Sat, 13 Dec 2014 15:24:49 +0000 (16:24 +0100)]
Fix for MODULES-1597: "format" is a file not a directory

The "format" entry in a SVN directory is a file, not a directory.

5 years agoMerge pull request #222 from cmurphy/master
Morgan Haskel [Tue, 9 Dec 2014 16:23:58 +0000 (08:23 -0800)]
Merge pull request #222 from cmurphy/master

Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md

5 years agoAdd json gem
Colleen Murphy [Tue, 9 Dec 2014 06:52:42 +0000 (22:52 -0800)]
Add json gem

The puppet_facts gem implicitly depends on the json gem.
On Ruby 1.8.7, json is not built in. On Puppet 2.7, it is
not explicitly pulled in by the hiera gem. So we add it
here explicitly.

5 years agoUpdate .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
Colleen Murphy [Mon, 8 Dec 2014 18:33:44 +0000 (10:33 -0800)]
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md

5 years agoMerge pull request #219 from laurenrother/readme
Morgan Haskel [Thu, 20 Nov 2014 20:04:37 +0000 (15:04 -0500)]
Merge pull request #219 from laurenrother/readme

Updates README per MODULES-1425

5 years agoUpdates README per MODULES-1425
Lauren Rother [Thu, 20 Nov 2014 19:57:00 +0000 (11:57 -0800)]
Updates README per MODULES-1425

Adds note to Setup section stating that the module will not create parent directories or install VCS software.

5 years agoMerge pull request #217 from mhaskel/test
Travis Fields [Tue, 4 Nov 2014 22:34:24 +0000 (14:34 -0800)]
Merge pull request #217 from mhaskel/test

Merge 1.2.x into master

5 years agoMerge pull request #216 from mhaskel/missing_doc
Travis Fields [Mon, 3 Nov 2014 22:23:48 +0000 (14:23 -0800)]
Merge pull request #216 from mhaskel/missing_doc

Add missing doc update.

5 years agoAdd missing doc update.
Morgan Haskel [Mon, 3 Nov 2014 22:20:15 +0000 (14:20 -0800)]
Add missing doc update.

5 years agoMerge pull request #215 from mhaskel/1.2.0-prep
Travis Fields [Mon, 3 Nov 2014 19:59:40 +0000 (11:59 -0800)]
Merge pull request #215 from mhaskel/1.2.0-prep

1.2.0 prep

5 years ago1.2.0 prep
Morgan Haskel [Mon, 3 Nov 2014 19:56:26 +0000 (11:56 -0800)]
1.2.0 prep

5 years agoMerge pull request #213 from jfautley/cvs-runas
Aaron Stone [Wed, 29 Oct 2014 14:08:37 +0000 (07:08 -0700)]
Merge pull request #213 from jfautley/cvs-runas

Add `user` feature support to CVS provider

5 years agoAdd spec test for invokation as a different user
Jon Fautley [Wed, 29 Oct 2014 11:00:33 +0000 (11:00 +0000)]
Add spec test for invokation as a different user

5 years agoRework spec tests to support new execution method
Jon Fautley [Wed, 29 Oct 2014 10:59:58 +0000 (10:59 +0000)]
Rework spec tests to support new execution method

5 years agoRevamp debugging output
Jon Fautley [Wed, 29 Oct 2014 10:55:42 +0000 (10:55 +0000)]
Revamp debugging output

5 years agoAdd `user` feature support to CVS provider
Jon Fautley [Tue, 28 Oct 2014 16:21:48 +0000 (16:21 +0000)]
Add `user` feature support to CVS provider

5 years agoMerge pull request #200 from Paulche/change_uid
Aaron Stone [Tue, 21 Oct 2014 19:23:23 +0000 (12:23 -0700)]
Merge pull request #200 from Paulche/change_uid

Change uid by Puppet execution API

5 years agoMerge pull request #210 from igalic/transpec
Aaron Stone [Tue, 21 Oct 2014 19:12:17 +0000 (12:12 -0700)]
Merge pull request #210 from igalic/transpec

Convert specs to RSpec 2.99.2 syntax with Transpec

5 years agoMerge pull request #211 from justinstoller/bug/master/FM-1951-ensure-git
Morgan Haskel [Thu, 16 Oct 2014 21:18:51 +0000 (14:18 -0700)]
Merge pull request #211 from justinstoller/bug/master/FM-1951-ensure-git

(FM-1951) Ensure Git is installable on EL 5 platforms

5 years ago(FM-1951) Ensure Git is installable on EL 5 platforms
Justin Stoller [Wed, 15 Oct 2014 19:41:46 +0000 (12:41 -0700)]
(FM-1951) Ensure Git is installable on EL 5 platforms

Git is not installed on EL 5, but it is not in the repos either.
With this patch, if we are going to install git on an EL 5 platform we
first ensure epel is installed(FM-1951) Ensure Git is installable on
EL 5 platforms

5 years agoConvert specs to RSpec 2.99.2 syntax with Transpec
Igor Galić [Mon, 29 Sep 2014 17:19:21 +0000 (19:19 +0200)]
Convert specs to RSpec 2.99.2 syntax with Transpec

This conversion is done by Transpec 2.3.7 with the following command:
    transpec

* 22 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 19 conversions
    from: obj.should
      to: expect(obj).to

* 15 conversions
    from: == expected
      to: eq(expected)

* 5 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

* 2 conversions
    from: its(:attr) { }
      to: describe '#attr' do subject { super().attr }; it { } end

* 2 conversions
    from: obj.should_not
      to: expect(obj).not_to

* 2 conversions
    from: proc { }.should
      to: expect { }.to

* 1 conversion
    from: be_false
      to: be_falsey

* 1 conversion
    from: be_true
      to: be_truthy

For more details: https://github.com/yujinakayama/transpec#supported-conversions

6 years agoMerge pull request #207 from sodabrew/excludes_string
Aaron Stone [Thu, 18 Sep 2014 00:31:23 +0000 (17:31 -0700)]
Merge pull request #207 from sodabrew/excludes_string

Handle both Array/Enumerable and String values for excludes parameter

6 years agoHandle both Array/Enumerable and String values for excludes parameter
Aaron Stone [Sun, 14 Sep 2014 06:27:25 +0000 (23:27 -0700)]
Handle both Array/Enumerable and String values for excludes parameter

Thanks to @revhazroot for identifying the problem that excludes with a
string or single-element array fails on Ruby >= 1.9.

6 years agoMerge pull request #206 from sodabrew/whitespace_p4
Aaron Stone [Wed, 17 Sep 2014 22:39:35 +0000 (15:39 -0700)]
Merge pull request #206 from sodabrew/whitespace_p4

Remove excess whitespace

6 years agoRemove excess whitespace
Aaron Stone [Sun, 14 Sep 2014 05:48:18 +0000 (22:48 -0700)]
Remove excess whitespace

6 years agoMerge pull request #209 from hunner/global_default
Travis Fields [Wed, 17 Sep 2014 16:04:46 +0000 (09:04 -0700)]
Merge pull request #209 from hunner/global_default

(MODULES-428) Remove dummy warning

6 years ago(MODULES-428) Remove dummy warning
Hunter Haugen [Mon, 15 Sep 2014 23:03:11 +0000 (16:03 -0700)]
(MODULES-428) Remove dummy warning

Puppet started raising a warning about multiple default providers due to
a change in puppet. The dummy provider exists to raise an error when
`provider` is not specified because there is no way to declare
`provider` as a required attribute in the type. Even passing a
`provider` value did not get rid of the "multiple default providers
found" warning however.

This commit causes the dummy provider to be the defacto default for all
resources which do not have an explicit provider declared, as the posix
feature is available on basically every operating system on which
vcsrepo works. (There is no way to create an "always default" provider.)

6 years agoMerge pull request #208 from sodabrew/simplecov_not_1.8.7
Hunter Haugen [Tue, 16 Sep 2014 23:27:30 +0000 (16:27 -0700)]
Merge pull request #208 from sodabrew/simplecov_not_1.8.7

Disable simplecov on Ruby 1.8.7

6 years agoMerge branch '1.1.x'
Hunter Haugen [Mon, 15 Sep 2014 20:41:04 +0000 (13:41 -0700)]
Merge branch '1.1.x'

6 years agoDisable simplecov on Ruby 1.8.7
Aaron Stone [Sun, 14 Sep 2014 06:34:46 +0000 (23:34 -0700)]
Disable simplecov on Ruby 1.8.7

6 years agoMerge pull request #204 from cyberious/1.1.x
Hunter Haugen [Wed, 10 Sep 2014 17:57:55 +0000 (10:57 -0700)]
Merge pull request #204 from cyberious/1.1.x

Fix issue with puppet_module_install, removed and using updated method f...

6 years agoFix issue with puppet_module_install, removed and using updated method from beaker...
Travis Fields [Wed, 10 Sep 2014 17:54:28 +0000 (10:54 -0700)]
Fix issue with puppet_module_install, removed and using updated method from beaker core copy_module_to

6 years agoMerge pull request #203 from mhaskel/spec_updates
Ashley Penney [Fri, 29 Aug 2014 17:02:46 +0000 (13:02 -0400)]
Merge pull request #203 from mhaskel/spec_updates

Update spec_helper for more consistency

6 years agoUpdate spec_helper for more consistency
Morgan Haskel [Thu, 28 Aug 2014 22:46:41 +0000 (18:46 -0400)]
Update spec_helper for more consistency

6 years agoChange uid by Puppet execution API
Paul Chechetin [Wed, 20 Aug 2014 07:47:34 +0000 (11:47 +0400)]
Change uid by Puppet execution API

6 years agoMerge pull request #196 from hunner/release_1.1.0
Morgan Haskel [Tue, 15 Jul 2014 00:39:49 +0000 (20:39 -0400)]
Merge pull request #196 from hunner/release_1.1.0

Release 1.1.0

6 years agoRelease 1.1.0
Hunter Haugen [Tue, 15 Jul 2014 00:33:34 +0000 (17:33 -0700)]
Release 1.1.0

Summary:
This release adds a Perforce provider* and corrects the git provider
behavior when using `ensure => latest`.

*(Only git provider is currently supported.)

Features:
- New Perforce provider

Bugfixes:
- (MODULES-660) Fix behavior with `ensure => latest` and detached HEAD
- Spec test fixes

6 years agoMerge branch 'master' into 1.0.x
Hunter Haugen [Tue, 15 Jul 2014 00:02:07 +0000 (17:02 -0700)]
Merge branch 'master' into 1.0.x

6 years agoMerge pull request #195 from hunner/fix_metadata
Ashley Penney [Mon, 14 Jul 2014 23:43:20 +0000 (19:43 -0400)]
Merge pull request #195 from hunner/fix_metadata

Fix metadata.json to match checksum

6 years agoFix metadata.json to match checksum
Hunter Haugen [Mon, 14 Jul 2014 23:40:41 +0000 (16:40 -0700)]
Fix metadata.json to match checksum

6 years agoMerge pull request #194 from justinstoller/maint/1.0.x/this_is_confusing
Hunter Haugen [Mon, 14 Jul 2014 23:37:58 +0000 (16:37 -0700)]
Merge pull request #194 from justinstoller/maint/1.0.x/this_is_confusing

(maint) Use `copy_module_to` in `beaker_helper.rb`

6 years ago(maint) Use `copy_module_to` in `beaker_helper.rb`
Justin Stoller [Mon, 14 Jul 2014 20:45:09 +0000 (13:45 -0700)]
(maint) Use `copy_module_to` in `beaker_helper.rb`

Previously we were using `puppet_module_install()`. Which was ported from
Beaker-RSpec. Unfortunately for our heros that method has been refactored
since this was ran last. The method `puppet_module_install()` in Beaker
installs from the public forge, while the previous behavior, installing via
scp from the current directory, has moved to the method `copy_module_to`.
This updates the helper for the beaker tests to use the updated method.

6 years agoMerge pull request #187 from p4paul/master
Hunter Haugen [Mon, 14 Jul 2014 21:11:01 +0000 (14:11 -0700)]
Merge pull request #187 from p4paul/master

Update Markdown with missing Perforce details.

6 years agoMerge pull request #193 from hunner/fix_helper
Hunter Haugen [Fri, 11 Jul 2014 22:16:33 +0000 (15:16 -0700)]
Merge pull request #193 from hunner/fix_helper

The helper calls host outside of an each loop

6 years agoThe helper calls host outside of an each loop
Hunter Haugen [Fri, 11 Jul 2014 22:15:34 +0000 (15:15 -0700)]
The helper calls host outside of an each loop

6 years agoMerge pull request #192 from hunner/fix_lint
Hunter Haugen [Fri, 11 Jul 2014 21:45:44 +0000 (14:45 -0700)]
Merge pull request #192 from hunner/fix_lint

Fix lint errors

6 years agoFix lint errors
Hunter Haugen [Fri, 11 Jul 2014 21:45:10 +0000 (14:45 -0700)]
Fix lint errors

6 years agoMerge branch '1.0.x'
Hunter Haugen [Fri, 11 Jul 2014 21:29:15 +0000 (14:29 -0700)]
Merge branch '1.0.x'