summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* (#2128) Whitespace only reflow commitJeff McCune2011-06-081-19/+17
* (#2128) In-line docs for node_name_{fact,value}Jeff McCune2011-06-081-2/+14
* Merge branch 'ticket/2.6.x/650' into 2.6.xNick Lewis2011-06-073-0/+32
|\
| * (#650) Allow symlinks for configuration directoriesNick Lewis2011-06-073-0/+32
|/
* Fix acceptance tests not managing their mastersNick Lewis2011-06-062-37/+22
* Merge branch 'ticket/2.6.x/2128' into 2.6.xNick Lewis2011-06-0615-433/+624
|\
| * (#2128) Add support for setting node name based on a factNick Lewis2011-06-069-3/+150
| * (#2128) Get facts before retrieving catalogNick Lewis2011-06-062-23/+22
| * (#2128) Add the ability to specify a node nameNick Lewis2011-06-0612-16/+81
| * maint: Refactor specs in preparation for making node name more flexibleNick Lewis2011-06-024-413/+393
* | (#7193) Fix path issues with acceptance tests that call old shell testsMatt Robinson2011-06-062-2/+2
* | Merge branch 'ticket/2.6.x/6885-puppet-agent-fingerprint-requires---verbose-t...Ben Hughes2011-06-032-2/+2
|\ \ | |/ |/|
| * (#6885) puppet agent fingerprint requires --verbose to return a value.Ben Hughes2011-06-032-2/+2
* | Merge branch 'bug/2.6.x/5318-minimal-fix' into 2.6.xDaniel Pittman2011-05-271-5/+9
|\ \
| * | (#5318) Always notice changes to manifests when compiling.Daniel Pittman2011-05-271-5/+9
|/ /
* | Merge branch 'ticket/2.6.x/7681' into 2.6.xNick Lewis2011-05-261-0/+27
|\ \
| * | (#7681) Add an acceptance test for resource refs with array variablesNick Lewis2011-05-261-0/+27
|/ /
* | Merge branch 'test/2.6.x/4123' into 2.6.xDominic Maraglia2011-05-242-51/+36
|\ \
| * | (4123) Fix test for 4123/4 on old egrep in cent4Dominic Maraglia2011-05-242-51/+36
|/ /
* | Merge branch '2.6.next' into 2.6.xPieter van de Bruggen2011-05-183-8/+8
|\ \
| * | Merge branch 'ticket/2.6.next/3836' into 2.6.nextMax Martin2011-05-133-8/+8
|/| |
| * | (#3836) External nodes should only capture stdoutOliver Hookins2011-05-133-8/+8
|/ /
* | Merge branch '2.6.next' into 2.6.xDaniel Pittman2011-05-1229-103/+457
|\ \
| * | adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| * | Merge branch 'ticket/2.6.next/7139' into 2.6.nextNick Lewis2011-05-032-1/+8
| |\ \
| | * | (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| |/ /
| * | Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into 2.6....Max Martin2011-04-283-1/+172
| |\ \
| | * | vim: Initial ftplugin and indent supportTodd Zullinger2011-04-023-1/+172
| * | | Merge branch 'ticket/2.6.next/6844' into 2.6.nextMax Martin2011-04-281-2/+1
| |\ \ \
| | * | | case seems needless here as there is only two opts, also the rest of the file...ben hengst2011-04-281-2/+1
| |/ / /
| * | | Merge branch 'ticket/2.6.x/6845' into 2.6.nextJames Turnbull2011-04-281-1/+1
| |\ \ \
| | * | | (#6845) Mount writes incorrect vfstab entriesStefan Schulte2011-04-281-1/+1
| |/ / /
| * | | Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into 2.6....Matt Robinson2011-04-272-3/+3
| |\ \ \
| | * | | (#6442) Be able to start agents --listen without namespaceauth.confMatt Robinson2011-04-272-3/+3
| |/ / /
| * | | Merge branch 'tickets/2.6.next/3420' into 2.6.nextJosh Cooper2011-04-261-1/+9
| |\ \ \
| | * | | (#3420) Nagios "name" attribute does not output correctlyJim Pirzyk2011-04-261-1/+9
| * | | | Merge branch 'tickets/2.6.next/4487' into 2.6.nextJosh Cooper2011-04-262-0/+15
| |\ \ \ \
| | * | | | (#4487) When setting environment on a host, ensure it is a string.Josh Cooper2011-04-262-0/+15
| * | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| * | | | | Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-futur...Jacob Helwig2011-04-222-8/+71
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | (#6487) Add some testing for OS X version support in DirectoryService providerJacob Helwig2011-04-221-0/+60
| | * | | | (#6487) Directoryservice provider will fail in future OS releasesGary Larizza2011-04-221-8/+11
| |/ / / /
| * | | | Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.nextJesse Wolfe2011-04-201-0/+2
| |\ \ \ \
| | * | | | Maint: Fix a #4655 introduced log inconsistencyJesse Wolfe2011-04-201-0/+2
| |/ / / /
| * | | | Move acceptance tests from puppet-acceptance repoDominic Maraglia2011-04-2093-0/+2084
| * | | | Merge branch 'ticket/2.6.next/7166' into 2.6.nextJosh Cooper2011-04-206-20/+20
| |\ \ \ \
| | * | | | Fixed #7166 - Replaced deprecated stomp "send" method with "publish"James Turnbull2011-04-206-20/+20
| |/ / / /
| * | | | Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2...Jacob Helwig2011-04-198-67/+151
| |\ \ \ \
| | * | | | (#4655) Allow stage to be set using a default class parameterJacob Helwig2011-04-196-66/+104
| * | | | | Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.nextJames Turnbull2011-04-141-0/+1
| |\ \ \ \ \