summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-14Merge pull request #261 from mhaskel/MODULES-2125Bryan Jen
MODULES-2125 - Allow revision to be passed without source
2015-08-14MODULES-2125 - Allow revision to be passed without sourceMorgan Haskel
Will also work with empty repositories.
2015-08-04Merge pull request #260 from mhaskel/MODULES-1800Bryan Jen
MODULES-1800 - fix case where ensure => latest and no revision specified
2015-08-03MODULES-1800 - fix case where ensure => latest and no revision specifiedMorgan Haskel
This would explode when revision was unspecified when you were on a branch. Use the branch you're currently on when updating.
2015-07-30Merge pull request #259 from mhaskel/merge_1.3.x_to_masterBryan Jen
Merge 1.3.x to master
2015-07-24Merge pull request #258 from mhaskel/1.3.1-prepHunter Haugen
1.3.1 prep
2015-07-241.3.1 prepMorgan Haskel
2015-07-22Explitly unset SSH_AUTH_SOCK; it is preferred to the -i flagAlex Vandiver
Even if the -i flag is explicitly passed via the command line, openssh ignores the identity file if an socket exists to an SSH authentication agent. In cases where puppet has been configured to use an explicit identity file, altering behavior based on the calling environment of puppet violates the principle of least surprise, and can lead to inconsistent deployments. Work around this odd corner case of ssh by explicitly unsetting SSH_AUTH_SOCK inside the ssh wrapper.
2015-06-30Merge pull request #256 from keeleysam/masterHunter Haugen
fix for detached HEAD on git 2.4+
2015-06-29fix for detached HEAD on git 2.4+Samuel Keeley
2015-06-29Merge pull request #242 from BillWeiss/bump-ssl-expiryHunter Haugen
Make sure the embedded SSL cert doesn't expire
2015-06-22Merge pull request #255 from jonnytpuppet/depth_fixDavid Schmitt
MODULES-2131 Git provider now takes account of revision property when using depth property.
2015-06-22MODULES-2131 Git provider now takes account of revision property when using ↵Jonathan Tripathy
depth property.
2015-06-19Merge pull request #252 from DavidS/add-https-clone-testJT (Jonny)
acceptance: Add a test verifying anonymous https cloning
2015-06-15Merge pull request #254 from hunner/add_helperBryan Jen
Add helper to install puppet/pe/puppet-agent
2015-06-11Add helper to install puppet/pe/puppet-agentHunter Haugen
2015-06-09Merge pull request #253 from justinstoller/maint/master/set-puppet-versionHunter Haugen
(maint) allow setting PUPPET_VERSION in acceptance
2015-06-08(maint) allow setting PUPPET_VERSION in acceptanceJustin Stoller
2015-05-29acceptance: Add a test verifying anonymous https cloningDavid Schmitt
In MODULES-891 the question arose whether https sources are supported. This test shows that it works.
2015-05-28Merge pull request #232 from netors/masterDavid Schmitt
Consider the submodules flag on specific revision cloning
2015-05-27Add ability to unittest puppet 4Hunter Haugen
2015-05-21Merge pull request #251 from mhaskel/merge_1.3.x_to_masterBryan Jen
Merge 1.3.x to master
2015-05-18Merge branch 'psoloway-readme' into 1.3.xMorgan Haskel
2015-05-18Last-minute README correctionsPete Soloway
* Corrected the list of supported platforms under Limitations * Spelled “revision spec” instead of “revisionspec”.
2015-05-13Merge pull request #249 from hunner/release_1.3.0Morgan Haskel
Release 1.3.0
2015-05-13Release 1.3.0Hunter Haugen
2015-05-13Merge pull request #246 from psoloway/readmeHunter Haugen
Update README per DOC-1501
2015-05-13Merge pull request #248 from hunner/fix_tmpMorgan Haskel
(MODULES-821) Don't use /tmp
2015-05-13(MODULES-821) Don't use /tmpHunter Haugen
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.
2015-05-07Merge pull request #247 from puppetlabs/modulesync_updatesTravis Fields
Modulesync updates
2015-05-06beaker gemfile fixesMorgan Haskel
2015-05-06sync via modulesyncMorgan Haskel
2015-05-06sync via modulesyncMorgan Haskel
2015-04-22Merge pull request #241 from tykeal/masterTP Honey
Clean up puppet lint warnings
2015-04-22Merge pull request #237 from cmurphy/rspec-puppet-2TP Honey
Testing updates
2015-04-21Merge upstream changes into readme branchPete Soloway
2015-04-21Update README per DOC-1501Pete Soloway
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.
2015-04-21Merge pull request #224 from puppet-by-examples/single-branchTP Honey
Shallow clone with one commit that corresponds to arbitrary tag from arbitrary branch
2015-04-16Merge pull request #243 from rnelson0/quotesMorgan Haskel
Enforce the style guide's recommendation of single quotes as the default.
2015-04-14Enforce the style guide's recommendation of single quotes as the default.Rob Nelson
2015-04-08Just bumping the expiration date...Bill Weiss
2015-04-06Clean up puppet lint warningsAndrew Grimberg
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>
2015-03-30Merge pull request #220 from ddisisto/1.2.x_add_svn_acceptTP Honey
Add support for 'conflict' parameter to populate svn --accept arg
2015-03-26Merge pull request #238 from anodelman/masterJustin Stoller
(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
2015-03-26Merge pull request #240 from cmurphy/hash_orderingBryan Jen
Fix remote hash ordering for unit tests
2015-03-25Fix remote hash ordering for unit testsColleen Murphy
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.
2015-03-24(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...Alice Nodelman
puppetdb, etc - support for BEAKER_VERSION and BEAKER_RSPEC_VERSION in gemfile
2015-03-23Update .travis.ymlColleen Murphy
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
2015-03-23Keep testing on puppet 2.7Colleen Murphy
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.
2015-03-19Unpin rspec-puppet and remove unneeded depsColleen Murphy
puppetlabs_spec_helper takes care of these for us.