summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-09-09Merge pull request #3067 from waynr/maint/stable/pup-3151wayne2-1/+210
2014-09-09(PUP-3151) Removed newline from host_entry test fixtureJeremy Barlow1-1/+1
2014-09-09(PUP-3151) Added acceptance test for External CA on JettyJeremy Barlow2-0/+209
2014-09-09(PUP-3157) Allow variable DNS name order in helpful error cert name testJeremy Barlow1-5/+32
2014-09-09(PUP-3162) Switch to a whitelist for $environment interpolationJosh Partlow5-43/+56
2014-09-09Merge pull request #3064 from highb/fix/master/symlink_checkAnderson Mills1-1/+1
2014-09-09(PUP-3191) Fix symlink checkingBrandon High1-1/+1
2014-09-09(PUP-3190) Add acceptance test for 4x function callsHenrik Lindberg1-0/+73
2014-09-09Merge branch 'pr/3054' into stableAndrew Parker2-1/+21
2014-09-09(maint) Cleanup test to be more readableAndrew Parker1-2/+7
2014-09-09(maint) Only append to peer_certs if verify succeededJosh Cooper1-3/+4
2014-09-08(maint) Correct parameter type from SSLContext to StoreContextJosh Cooper1-9/+9
2014-09-08(PUP-3162) Prevent $environment interpolation in directory environmentsJosh Partlow3-10/+163
2014-09-08Merge remote-tracking branch 'upstream/pr/3057' into stableJosh Cooper2-3/+7
2014-09-08correct test description for http_compression disabledJohan Haals1-1/+1
2014-09-08(PUP-1680) Set accept-encoding to identity when http_compression is falseJohan Haals2-2/+6
2014-09-08Merge pull request #3055 from hlindberg/PUP-3177_Stable-Remove-square-bracket...Josh Cooper2-4/+12
2014-09-08(maint) Remove unused constant from default_manifest_specJosh Partlow1-1/+0
2014-09-08(PUP-3190) Don't assume puppet is in a lib dirAndrew Parker7-76/+67
2014-09-06(PUP-3177) Remove magic handling of square brackets in resource titleHenrik Lindberg2-4/+12
2014-09-06(PUP-3174) Make settings catalog skip manifestdir if environmentpathHenrik Lindberg2-1/+16
2014-09-03Merge remote-tracking branch 'upstream/master' into stableJosh Partlow1-1/+1
2014-09-03(packaging) Update PUPPETVERSION to 3.7.0Josh Partlow1-1/+1
2014-09-03Merge remote-tracking branch 'upstream/master' into stableJosh Partlow882-13328/+42149
2014-09-03Merge pull request #3016 from nfagerlund/docs_37_file_functionHenrik Lindberg5-14/+42
2014-09-03Merge pull request #3021 from nfagerlund/docs_clarify_resources_resourcesJosh Partlow1-5/+5
2014-09-02(maint) Namespace constant declaration in specs to prevent warningsJosh Partlow2-2/+6
2014-09-02(maint) Expect test to fail on windows ruby 2.0 x86Josh Cooper1-1/+5
2014-09-02Merge branch 'master' of github.com:puppetlabs/puppetJosh Cooper1-2/+2
2014-09-02Merge branch 'feature/master/pup-3069-win-spec-fix'Josh Partlow1-2/+2
2014-09-02(PUP-3069) Fix path expansion for environment.conf test on WinJosh Partlow1-2/+2
2014-09-02(PUP-2349) Add windows specific expectation for deprecation_warningJosh Cooper1-2/+10
2014-09-02(PUP-2349) Add windows specific expectation for deprecation_warningJosh Cooper1-2/+10
2014-08-30Merge pull request #3032 from jpartlow/feature/master/pup-3069-add-defaultman...Henrik Lindberg13-27/+556
2014-08-30(PUP-3069) Clear configuration_file for testsJosh Partlow1-0/+1
2014-08-29(PUP-3069) Test both future and current parser with default_manifestJosh Partlow1-170/+186
2014-08-29(PUP-3069) Update default_manifest setting descriptionsJosh Partlow1-5/+17
2014-08-29Merge pull request #3024 from hlindberg/PUP-3117_resource-expression-splat-ro...Josh Partlow8-176/+268
2014-08-29(PUP-3069) Change restrict_environment_manifest nameJosh Partlow9-27/+27
2014-08-29Merge pull request #3036 from melissaanne/ticket/master/fix-reportsdir-ownershipKylo Ginsberg3-1/+6
2014-08-29(PUP-3163) Create and manage the mode of $reportsdirMelissa Stone3-1/+6
2014-08-29(maint) Clear record of configured deprecated settingsJosh Partlow1-4/+5
2014-08-29(PUP-3069) Add an integration spec for default_manifestJosh Partlow1-0/+256
2014-08-29(PUP-3069) Halt compile if environment has manifest conflictJosh Partlow6-3/+110
2014-08-29(PUP-3069) Add spec test for new default optionsBritt Gresham3-6/+32
2014-08-29(PUP-3069) Add default manifest settingsJosh Partlow4-15/+125
2014-08-28Merge pull request #3031 from andersonmills/fix/master/PUP-3155-improve_pe_ve...Kylo Ginsberg1-2/+2
2014-08-28Merge pull request #3029 from cprice404/bug/master/PUP-3153-guard-against-nil...Kylo Ginsberg3-3/+7
2014-08-28PUP-3155 Improve spec tests around the PE puppet versionAnderson Mills1-2/+2
2014-08-28(PUP-3153) Guard against nil when closing UniquefilesChris Price3-3/+7