summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-add activesupport testsjk/activesupport-testsJohn Keiser2016-04-199-45/+47
* Update changelog generator to latestjk/update-changelogJohn Keiser2016-04-193-4/+3
* Don't disable shared gems in bundle/config (checkin miss)John Keiser2016-04-191-1/+0
* Bump version of chef to 12.10.7 by Chef Versioner.v12.10.7Chef Versioner2016-04-195-8/+9
* Merge pull request #4840 from chef/jk/version-without-berksJohn Keiser2016-04-191-3/+1
|\
| * Don't use berks when bumping version--can't possibly change.jk/version-without-berksJohn Keiser2016-04-181-3/+1
* | Merge pull request #4839 from chef/lcg/fix-resources-api-issuesThom May2016-04-191-6/+6
|\ \ | |/ |/|
| * how did that get there?lcg/fix-resources-api-issuesLamont Granquist2016-04-181-1/+1
| * fix details in with_run_contextLamont Granquist2016-04-181-7/+7
* | Merge pull request #4820 from chef/jk/lock-depsJohn Keiser2016-04-1860-339/+3413
|\ \ | |/ |/|
| * Make FIPS use the /opt/chef bundle to run the testsjk/lock-depsJohn Keiser2016-04-181-15/+23
| * Fix bundle outdatedJohn Keiser2016-04-183-16/+22
| * Don't update fips serverspec Gemfile.lockJohn Keiser2016-04-187-38/+21
| * Install even less stuff on TravisJohn Keiser2016-04-182-9/+12
| * No darwin gemspec plzJohn Keiser2016-04-181-58/+0
| * Install even less stuff before tests on WindowsJohn Keiser2016-04-181-1/+1
| * Don't lock acceptance for other platformsJohn Keiser2016-04-184-25/+11
| * Just use the actual installed bundle instead of reusing the Gemfile to run Ch...John Keiser2016-04-183-2/+3
| * Don't update bundler when running acceptance testJohn Keiser2016-04-183-30/+19
| * Install only core chef plus test when testingJohn Keiser2016-04-182-5/+2
| * Don't bundle install on testsJohn Keiser2016-04-182-2/+2
| * Run acceptance from the acceptance dir in the Chef gemJohn Keiser2016-04-181-1/+1
| * Add test and ruby_prof groups since aix and solaris can't compile without themJohn Keiser2016-04-181-2/+0
| * Remove Gemfile.windows and put both platforms in Gemfile.lockJohn Keiser2016-04-1824-662/+228
| * Allow Windows to freezeJohn Keiser2016-04-187-15/+14
| * Make gemfile_util capable of copying groups overJohn Keiser2016-04-1825-316/+604
| * Simplify external tests and make them work with Gemfile.lockJohn Keiser2016-04-1821-430/+822
| * Use locked dependencies to build chefJohn Keiser2016-04-1823-49/+879
| * Pin everything down with Gemfile.lock, add rake dependencies to updateJohn Keiser2016-04-1825-39/+2125
|/
* Bump version of chef to 12.10.6 by Chef Versioner.v12.10.6Chef Versioner2016-04-183-3/+3
* Merge pull request #4834 from chef/lcg/resources-apiLamont Granquist2016-04-189-27/+586
|\
| * fix ! in yard commentlcg/resources-apiLamont Granquist2016-04-181-1/+1
| * ignore deprecation warning in testLamont Granquist2016-04-151-0/+1
| * typofixLamont Granquist2016-04-151-1/+1
| * add better resource manipulation APILamont Granquist2016-04-158-27/+585
* | Bump version of chef to 12.10.5 by Chef Versioner.v12.10.5Chef Versioner2016-04-153-3/+3
* | Merge pull request #4835 from chef/schisamo/omnibus-build-lab-fixesSeth Chisamore2016-04-152-28/+14
|\ \ | |/ |/|
| * Ignore the `omnibus/Berksfile.lock`Seth Chisamore2016-04-151-0/+1
| * Update platform list to match Chef’s actual build matrixSeth Chisamore2016-04-151-28/+13
|/
* Bump version of chef to 12.10.4 by Chef Versioner.v12.10.4Chef Versioner2016-04-143-3/+3
* Merge branch 'lcg/nillable-apt-repository-distribution'Lamont Granquist2016-04-146-21/+55
|\
| * allow true to mean nil via coercsionslcg/nillable-apt-repository-distributionLamont Granquist2016-04-141-6/+6
| * add nillable apt_repository and nillable propertiesLamont Granquist2016-04-146-16/+50
|/
* Bump version of chef to 12.10.3 by Chef Versioner.v12.10.3Chef Versioner2016-04-143-3/+3
* Merge pull request #4830 from chef/tm/fs_dirs_2Thom May2016-04-1416-12/+32
|\
| * Move unused code into backcompatThom May2016-04-141-0/+1
| * Move deprecated error classes into backcompatThom May2016-04-148-0/+0
| * Rename and add backcompat requires for ChefFS dirstm/fs_dirs_2Thom May2016-04-147-12/+31
|/
* Bump version of chef to 12.10.2 by Chef Versioner.v12.10.2Chef Versioner2016-04-143-3/+3
* Merge pull request #4826 from chef/tm/flow_252Thom May2016-04-1414-36/+572
|\
View Lorry Controller Status