summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/2.6.next/5909' of https://github.com/bodepd/puppet into...Jesse Wolfe2011-03-291-0/+47
|\
| * (5909) Function to dyncamically generate resources.Dan Bode2011-03-161-0/+47
* | (#6830) Fix MD5 handling to work with Ruby 1.9Matt Robinson2011-03-291-2/+2
* | Merge branch 'ticket/next/5477' into nextJesse Wolfe2011-03-252-3/+3
|\ \
| * | (#5477) Allow watch_file to watch non-existent files, especially site.ppJesse Wolfe2011-03-252-3/+3
* | | Merge branch 'tickets/master/6850-resource_type_listing_and_converting' into ...Luke Kanies2011-03-251-0/+28
|\ \ \ | |/ / |/| |
| * | Fixing #6851 - ResourceType#find/search loads typesLuke Kanies2011-03-251-0/+28
* | | (#4576) Raise an error when a node is classified into a non-existent classJesse Wolfe2011-03-241-10/+6
|/ /
* | (#6555) Fix another ruby 1.9 incompatible case statementMatt Robinson2011-03-221-1/+1
* | Merge branch '2.6.x' into nextMatt Robinson2011-03-181-4/+5
|\|
| * (#5392) Give a better error when realizing a non-existant resourceMatt Robinson2011-03-091-4/+5
* | Merge branch '2.6.next' into nextMatt Robinson2011-03-076-1749/+1846
|\|
| * Merge branch 'maint/2.6.next/revert-5935' into 2.6.nextNick Lewis2011-02-282-980/+962
| |\
| | * Revert "(#5935) Allow functions to accept negated values"Nick Lewis2011-02-212-980/+962
| * | (#6338) Remove unused version control tagsMatt Robinson2011-02-281-3/+0
| |/
| * (#5935) Allow functions to accept negated valuesNick Lewis2011-02-172-962/+980
| * (Fixes #6269) merge changes from masterzen that resolve the issue.Daniel Pittman2011-02-122-393/+401
| |\
| | * Fix #6269 - Hashes only work with two levels of accessBrice Figureau2011-02-122-800/+793
| * | (#5516) Rebuild parser.rb after merge.Daniel Pittman2011-02-121-1541/+1630
| * | Merge branch 'masterzen/tickets/2.6.x/5516' into bug/2.6.next/5516-hashes-can...Daniel Pittman2011-02-122-426/+416
| |\ \
| | * | Fix #5516 - Hashes can't be used in selectorsBrice Figureau2011-02-122-426/+416
| | |/
| * | Merge branch 'masterzen/tickets/2.6/5720' into bug/2.6.next/5720-puppetdoc-fa...Daniel Pittman2011-02-123-5/+8
| |\ \
| | * | Fix #5720 - puppetdoc misses some class commentsBrice Figureau2011-02-112-4/+7
| | * | Fix #6280 - puppetdoc crashing on string interpolationBrice Figureau2011-02-111-1/+1
| | |/
| * | (#6270) Fix formatting in split function's doc stringnfagerlund2011-02-091-7/+7
| * | (#6270) Fix formatting in regsubst function's doc stringnfagerlund2011-02-091-14/+7
| |/
* | Revert #5691 "Merge remote branch 'brice/feature/process-instrumentation' int...Jesse Wolfe2011-03-011-5/+1
* | Merge remote branch 'brice/feature/process-instrumentation' into nextJesse Wolfe2011-02-251-1/+5
|\ \
| * | Some high-level process name probesBrice Figureau2010-12-181-1/+5
* | | Merge branch '2.6.x' into nextMatt Robinson2011-02-023-12/+52
|\ \ \ | | |/ | |/|
| * | Merge branch 'tickets/2.6.x/5564' into 2.6.nextPaul Berry2011-02-011-3/+6
| |\ \
| | * | Fixed #5564 - Added some more fqdn_rand documentationJames Turnbull2011-02-011-3/+6
| * | | Merge branch 'ticket/2.6.next/5045' into 2.6.nextMatt Robinson2011-02-011-3/+18
| |\ \ \
| | * | | (#5045) Cleaning up some tests and codeMatt Robinson2011-01-241-1/+1
| | * | | (#5045) External node classifiers should be able to specify params for classesDan Bode2011-01-241-3/+18
| * | | | (#5944) Remove documentation of define() when used on nodes, as it is not a s...nfagerlund2011-01-251-21/+3
| * | | | (#5944) Further edits of inline defined() documentation.nfagerlund2011-01-251-25/+30
| * | | | (#5944) Improve documentation of defined() functionnfagerlund2011-01-251-6/+41
| |/ / /
* | | | Merge branch '2.6.x' into nextNick Lewis2011-01-061-0/+4
|\| | |
| * | | maint: Prune #inspect methods on various objectsJesse Wolfe2011-01-031-0/+4
| * | | maint: Fix tests that don't run on their ownMatt Robinson2010-12-161-0/+1
| |/ /
* | | maint: Fix tests that don't run on their ownMatt Robinson2010-11-221-0/+1
* | | Merge commit '2.6.3' into nextPaul Berry2010-11-174-58/+51
|\| | | |/ |/|
| * Fix for #5298 -- Collections need to do type lookupMarkus Roberts2010-11-161-1/+2
| * Step towards [5298] -- cleanup indentation, etc. in AST::CollectionMarkus Roberts2010-11-161-51/+33
| * Fix #4921 - race condition in Parser Functions creationBrice Figureau2010-11-121-2/+4
| * Fix #5252 - line number mis-attribution during parsingBrice Figureau2010-11-111-3/+3
| * Fix #5127 - error when accessing array elementsBrice Figureau2010-11-101-2/+10
* | Merge commit '2.6.3rc2' into nextPaul Berry2010-11-093-6/+8
|\|
| * (#4534/#4778) -- Normalize parameterized classesPaul Berry2010-10-272-5/+6