summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/2.6.next/5909' of https://github.com/bodepd/puppet into...Jesse Wolfe2011-03-292-0/+182
|\
| * (5909) Function to dyncamically generate resources.Dan Bode2011-03-162-0/+182
* | Merge branch 'feature/master/5432' of https://github.com/keymon/puppet into nextJesse Wolfe2011-03-295-1/+961
|\ \
| * | (#5432) Use AIX native commands to manage users and groupsHector Rivas Gandara2011-01-103-117/+100
| * | (#5432) Use AIX native commands to manage users and groupsHector Rivas Gandara2011-01-105-318/+516
| * | (#5432) Use AIX native commands to manage users and groupsHector Rivas Gandara2011-01-103-11/+15
| * | (#5432) Use AIX native commands to manage users and groupsHector Rivas Gandara2010-12-273-78/+201
| * | (#5432) Use AIX native commands to manage users and groupsHector Rivas Gandara2010-12-273-0/+652
* | | Merge branch 'ticket/next/6830-ready_to_merge' into nextMatt Robinson2011-03-2922-84/+95
|\ \ \
| * | | (#6830) Fix tests that depended on special inherited behaviorMatt Robinson2011-03-2913-63/+66
| * | | (#6830) Fix overly stubbed testsMatt Robinson2011-03-291-11/+15
| * | | (#6830) Fix instance_variables now comes back as symbolsMatt Robinson2011-03-291-1/+1
| * | | (#6830) Fix badly stubbed Time object in testMatt Robinson2011-03-292-2/+2
| * | | (#6830) Fix MD5 handling to work with Ruby 1.9Matt Robinson2011-03-291-2/+2
| * | | (#6830) Fix File class scopingMatt Robinson2011-03-292-4/+4
| * | | (#6830) Handle case where array is actually a stringMatt Robinson2011-03-291-0/+1
| * | | (#6830) Fix case where instance_variables returns symbols in Ruby 1.9Matt Robinson2011-03-291-1/+4
|/ / /
* | | Merge branch 'ticket/next/5477' into nextJesse Wolfe2011-03-259-32/+44
|\ \ \
| * | | (#5477) Allow watch_file to watch non-existent files, especially site.ppJesse Wolfe2011-03-259-32/+44
* | | | Merge branch 'ticket/2.6.next/5477' into nextJesse Wolfe2011-03-250-0/+0
|\ \ \ \
| * | | | (#5477) Allow watch_file to watch non-existent files, especially site.ppJesse Wolfe2011-03-259-28/+40
* | | | | Merge commit '2.6.next^1' into nextJesse Wolfe2011-03-255-12/+32
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ticket/2.6.next/5221' into 2.6.nextNick Lewis2011-03-242-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | (#5221) Add test for fix to fileset with trailing separatorNick Lewis2011-03-241-0/+8
| | * | | | (#5221) Fix fileset path absoluteness checking with trailing slashJames Turnbull2011-03-241-0/+1
| * | | | | Merge branch 'feature/2.6.next/4576' of https://github.com/bodepd/puppet into...Jesse Wolfe2011-03-242-3/+2
| |\ \ \ \ \
| | * | | | | (4576) - if ENC declares invalid class, it is logged at warning.Dan Bode2011-03-162-3/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-03-241-2/+3
| |\ \ \ \ \
| | * | | | | Update CHANGELOG for 2.6.7Jacob Helwig2011-03-241-2/+3
| | |/ / / /
| * | | | | Merge branch 'ticket/2.6.next/4769' into 2.6.nextNick Lewis2011-03-242-10/+20
| |\ \ \ \ \
| | * | | | | (#4769) Fix negative timeout support for newer rubiesNick Lewis2011-03-242-10/+20
| |/ / / / /
* | | | | | Merge branch 'tickets/next/6855-searching_in_resource_type' into nextLuke Kanies2011-03-252-3/+41
|\ \ \ \ \ \
| * | | | | | (#6855) ResourceType#search now accepts a regexLuke Kanies2011-03-252-3/+41
|/ / / / / /
* | | | | | Merge branch 'tickets/master/6850-resource_type_listing_and_converting' into ...Luke Kanies2011-03-258-26/+241
|\ \ \ \ \ \
| * | | | | | Fixing #6851 - ResourceType#find/search loads typesLuke Kanies2011-03-254-17/+188
| * | | | | | Fixing Module#path detectionLuke Kanies2011-03-252-8/+33
| * | | | | | Fixed #6850 - Clean up ResourceType#to_psonLuke Kanies2011-03-253-8/+27
* | | | | | | Merge branch 'ticket/next/6830_stat_calls' into nextMatt Robinson2011-03-259-9/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | (#6830) Fix stat method calls to not use an unneeded argumentMatt Robinson2011-03-259-9/+9
|/ / / / / /
* | | | | | Merge branch 'ticket/next/4576' into nextJesse Wolfe2011-03-243-30/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | (#4576) Raise an error when a node is classified into a non-existent classJesse Wolfe2011-03-243-30/+12
|/ / / / /
* | | | | Merge branch 'next'Max Martin2011-03-2395-621/+2197
|\ \ \ \ \
| * | | | | Merge branch '2.6.next' into nextMax Martin2011-03-2317-471/+1742
| |\| | | |
| | * | | | Merge branch 'tickets/2.6.x/6562' into 2.6.nextJames Turnbull2011-03-221-1/+0
| | |\ \ \ \
| | | * | | | Fixed #6562 - Minor kick documentation fixJames Turnbull2011-03-221-1/+0
| | * | | | | Merge branch 'ticket/2.6.next/6658' into 2.6.nextMatt Robinson2011-03-182-5/+3
| | |\ \ \ \ \
| | | * | | | | (#6658) Propagate ENC connection errors to the agentMatt Robinson2011-03-182-5/+3
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'ticket/2.6.x/5814' into 2.6.nextMax Martin2011-03-181-18/+466
| | |\ \ \ \ \
| | | * | | | | (#5814) Improved cron type specsStefan Schulte2011-01-091-17/+454
| | | * | | | | (#5814) cron_spec shouldn't depend on cron providerStefan Schulte2011-01-091-1/+12
| | | | |_|/ / | | | |/| | |