summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add puppet master polling step for ticket 7117Dominic Maraglia2011-05-201-1/+11
* Merge branch 'ticket/2.7.x/7507' into 2.7.xJosh Cooper2011-05-201-2/+2
|\
| * (#7507) Add exclude filter for ruby 1.9 spec failuresJosh Cooper2011-05-201-2/+2
* | Merge branch 'ticket/2.7.x/7507' into 2.7.xJosh Cooper2011-05-204-9/+9
|\|
| * (#7502) Fixed parser spec for ruby 1.8.5Josh Cooper2011-05-201-2/+2
| * (#7507) Add more 1.9 filtersJosh Cooper2011-05-203-7/+7
|/
* Merge branch '2.7.next' into 2.7.xMatt Robinson2011-05-1963-1568/+2186
|\
| * Merge branch 'feature/2.7.next/6395_envpuppet' into 2.7.nextJeff McCune2011-05-191-3/+56
| |\
| | * (#6395) Add extpuppet help, eval, and interfacesJeff McCune2011-05-191-3/+56
| |/
| * Merge branch '2.7.x' into 2.7.nextMichael Stahnke2011-05-181-0/+20
| |\
| * \ Merge branch '2.6.x' into 2.7.nextPieter van de Bruggen2011-05-183-8/+8
| |\ \
| | * \ 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
| | |/ /
| * | | Adding a sleep state post starting masterDominic Maraglia2011-05-181-0/+3
| * | | Merge branch 'ticket/2.7.next/7523' into 2.7.nextNick Lewis2011-05-175-1278/+1010
| |\ \ \
| | * | | (#7523) Refactor the grammar to reduce duplicationNick Lewis2011-05-175-1278/+1010
| * | | | maint: fix spec_helper inclusions again.Daniel Pittman2011-05-1717-45/+25
| * | | | Merge branch '2.7.x' into 2.7.nextPieter van de Bruggen2011-05-1775-203/+203
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'ticket/2.7.next/7114' into 2.7.nextNick Lewis2011-05-165-108/+420
| |\ \ \ \
| | * | | | (#7114) Fix specs for ssh authorized key parsed providerNick Lewis2011-05-161-32/+21
| | * | | | (#7114) Target returns correct valueStefan Schulte2011-05-161-6/+0
| | * | | | (#7114) Add integration tests for authorized_keyStefan Schulte2011-05-161-0/+207
| | * | | | (#7114) Improve unit tests for ssh_authorized_keyStefan Schulte2011-05-161-70/+180
| | * | | | (#7114) Improve value validation for authorized_keyStefan Schulte2011-05-161-0/+12
| |/ / / /
| * | | | Merge branch 'ticket/2.7.x/7300' into 2.7.nextNick Lewis2011-05-162-0/+59
| |\ \ \ \
| | * | | | (#7300) Fix instances method of mount providerStefan Schulte2011-05-161-0/+18
| | * | | | (#7300) Add specs for the mount providerStefan Schulte2011-05-011-0/+41
| * | | | | Merge branch 'tickets/2.7.x/7259-make-active-record-test-requirement-optional...Jacob Helwig2011-05-162-3/+12
| |\ \ \ \ \
| | * | | | | (#7259) Remove ActiveRecord requirement from indirector face specJacob Helwig2011-05-161-2/+11
| | * | | | | (#7259) Do not try to load all Terminus classes when configuring the IndirectorJacob Helwig2011-05-161-1/+1
| * | | | | | Merge branch '2.7.x' into 2.7.nextMatt Robinson2011-05-134-61/+73
| |\| | | | |
| * | | | | | Revert "(#7220) Add the ability to "inherit" options."Daniel Pittman2011-05-124-136/+0
| * | | | | | maint: sync 'authconfig' to 'rest_authconfig' settingDaniel Pittman2011-05-121-1/+1
| * | | | | | Merge branch '2.6.x' into 2.7.nextDaniel Pittman2011-05-127-10/+183
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | 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
| | | |/ / / / / /
| | * | | | | | | Update CHANGELOG for 2.6.8Jacob Helwig2011-04-271-2/+5
| | * | | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | * | | | | | | Move tests from puppet-acceptance repoDominic Maraglia2011-04-2092-0/+2045