summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | maint: Fix order dependent spec failure for face indirectionMatt Robinson2011-05-261-1/+2
| * | | | | (#7690) Don't blow up when listing terminuses available for facesMatt Robinson2011-05-264-24/+25
| * | | | | maint: Dedup the loadpath so we don't have to walk it multiple timesMatt Robinson2011-05-262-3/+3
* | | | | | Merge branch '2.7rc' into 2.7.xNick Lewis2011-05-263-6/+47
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge branch 'ticket/2.7rc/7681' into 2.7rcNick Lewis2011-05-263-6/+47
| |\ \ \ \
| | * | | | (#7681) Add an acceptance test for resource refs with array variablesNick Lewis2011-05-261-0/+27
| | * | | | (#7681) Allow array variables as resource referencesNick Lewis2011-05-262-6/+20
| |/ / / /
| * | | | (#7507) Add exclude filter for ruby 1.9 spec failuresJosh Cooper2011-05-201-2/+2
* | | | | Maint: Fix ellipses for short descriptionsnfagerlund2011-05-262-4/+13
* | | | | Merge branch 'ticket/2.7.x/7561-help_for_all_faces' into 2.7.xnfagerlund2011-05-2627-373/+844
|\ \ \ \ \
| * | | | | (#7563) DRY: Remove indirector boilerplate from individual facesnfagerlund2011-05-2612-113/+0
| * | | | | (#7564) Finish templatesnfagerlund2011-05-265-60/+271
| * | | | | (#7561) Complete help text for all faces and actionsnfagerlund2011-05-2622-257/+628
| * | | | | Maint: Add ellipsis to generated short_descriptions.nfagerlund2011-05-261-1/+1
| * | | | | (#6962) Add "arguments" method to help APInfagerlund2011-05-261-0/+2
|/ / / / /
| | | | * Merge branch '2.7.x'Daniel Pittman2011-05-252-44/+75
| | | | |\
| | | | | * Merge branch '2.6.x' into 2.7.xDaniel Pittman2011-05-250-0/+0
| |_|_|_|/| |/| | | |/ | | | |/| | | |/| |
| | * | | Merge branch 'test/2.6.x/4123' into 2.6.xDominic Maraglia2011-05-242-51/+36
| | |\ \ \
* | | \ \ \ Merge branch 'test/2.6.x/4123' into 2.7.xDominic Maraglia2011-05-242-51/+36
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | maint: Remove reliance on system clock from schedule spec testsJosh Cooper2011-05-241-42/+73
* | | | | | Merge branch 'tests/2.7.x/7117' into 2.7.xDominic Maraglia2011-05-241-1/+11
|\ \ \ \ \ \
| * | | | | | add puppet master polling step for ticket 7117Dominic Maraglia2011-05-201-1/+11
* | | | | | | Added the vcsrepo type and providers to the coreJames Turnbull2011-05-237-0/+763
|/ / / / / /
* | | | | | 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 'test/2.6.x/4123'Dominic Maraglia2011-05-242-51/+36
| | | | | | |\ | | | |_|_|_|/ | | |/| | | |
| | * | | | | (4123) Fix test for 4123/4 on old egrep in cent4Dominic Maraglia2011-05-242-51/+36
| | | |/ / / | | |/| | |
| | | | | * Merge branch 'tests/master/7117'Dominic Maraglia2011-05-241-2/+10
| | | | | |\
| | | | | | * add puppet master polling step for ticket 7117Dominic Maraglia2011-05-241-2/+10
| | | | | |/
| | | | | * Merge branch 'ticket/master/maint-ruby19_fix'Matt Robinson2011-05-242-4/+3
| | | | | |\
| | | | | | * maint: Fix pacman provider to work with Ruby 1.9Matt Robinson2011-05-242-4/+3
| | | | | |/
| | | | | * Merge branch '2.7.x'Matt Robinson2011-05-2310-20/+87
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | 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 'ticket/2.7.x/maint-stub_trap' into 2.7.xMatt Robinson2011-05-194-8/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | maint: move trap call to Signal so we can stub it for specsMatt Robinson2011-05-194-8/+2
|/ / / / /
* | | | | Updated CHANGELOG for 2.7.0rc3Michael Stahnke2011-05-181-0/+20
* | | | | Merge branch 'tickets/2.7.x/7259' into 2.7.xPieter van de Bruggen2011-05-182-3/+12
|\ \ \ \ \
| * | | | | (#7259) Remove ActiveRecord requirement from indirector face specJacob Helwig2011-05-181-2/+11
| * | | | | (#7259) Do not try to load all Terminus classes when configuring the IndirectorJacob Helwig2011-05-181-1/+1
|/ / / / /
* | | | | Adding a sleep state post starting masterDominic Maraglia2011-05-171-0/+3
| | | | * Merge branch 'vcsrepo'James Turnbull2011-05-237-0/+763
| | | | |\
| | | | | * Added the vcsrepo type and providers to the coreJames Turnbull2011-05-237-0/+763
| | | | |/
| | | | * Merge branch 'next'Pieter van de Bruggen2011-05-1826-1331/+1046
| | | | |\
| | | | | * Merge branch '2.7.next' into nextPieter van de Bruggen2011-05-1825-1331/+1043
| | | | | |\ | | |_|_|_|/ | |/| | | |