summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix style warnings with latest rubocoptm/stylinateThom May2018-06-132-11/+9
* Update CHANGELOG.md to reflect the promotion of 2.2.6Chef Expeditor2018-03-221-11/+8
* Bump version to 2.2.6 by Expeditorv2.2.6Chef Expeditor2018-03-013-4/+12
* Merge pull request #55 from chef/toml_supportThom May2018-03-014-7/+45
|\
| * Fixing some test warnings I sawtoml_supporttyler-ball2018-02-281-5/+5
| * Adding support for reading from TOML filestyler-ball2018-02-284-2/+40
|/
* Update CHANGELOG.md to reflect the promotion of 2.2.5Chef Expeditor2018-02-091-11/+8
* Bump version to 2.2.5 by Expeditorv2.2.5Chef Expeditor2018-02-093-5/+13
* Merge pull request #53 from chef/tduffield/read-from-jsonTom Duffield2018-02-093-2/+51
|\
| * Add support for reading from JSON filesTom Duffield2018-02-093-2/+51
|/
* Merge pull request #51 from chef/tduffield/read-from-yamlTom Duffield2018-02-092-1/+95
|\
| * Add support for loading config from YAML filesTom Duffield2018-02-092-1/+95
|/
* Merge pull request #52 from chef/tduffield/expeditor/initial-setupTom Duffield2018-02-097-19/+73
|\
| * Initial Expeditor setupTom Duffield2018-02-097-19/+73
|/
* Merge pull request #50 from chef/tm/codeownersThom May2017-08-311-0/+1
|\
| * add codeownerstm/codeownersThom May2017-08-311-0/+1
|/
* Merge pull request #49 from chef/lcg/chefstyle2Lamont Granquist2017-06-201-18/+18
|\
| * fix chefstyle offensesLamont Granquist2017-06-201-18/+18
|/
* Merge pull request #47 from chef/tm/re_chefstyleThom May2016-12-062-28/+28
|\
| * Fix chefstyle bustagetm/re_chefstyleThom May2016-12-062-28/+28
|/
* Merge pull request #45 from KierranM/configurable-listsThom May2016-12-063-0/+384
|\
| * Update READMEKierran McPherson2016-09-211-0/+94
| * Add support for lists and hashes of context configsKierran McPherson2016-09-212-1/+291
* | Merge pull request #46 from chef/Ruby22Thom May2016-10-137-22/+63
|\ \ | |/ |/|
| * Allow chefstyle to floatRuby22Tim Smith2016-10-131-1/+1
| * Run the default rake task in TravisTim Smith2016-09-291-7/+5
| * Add license and contributing to the readmeTim Smith2016-09-291-3/+31
| * Use chefstyle and add it to RakeTim Smith2016-09-295-10/+24
| * Require Ruby 2.2Tim Smith2016-09-291-2/+3
|/
* Merge pull request #44 from chef/lcg/add-spec-testLamont Granquist2016-09-071-0/+14
|\
| * add spec test for unusual behaviorLamont Granquist2016-09-071-0/+14
|/
* Merge pull request #43 from chef/2.2.4v2.2.4Matt Wrock2016-09-022-1/+9
|\
| * release 2.2.42.2.4Matt Wrock2016-09-022-1/+9
|/
* Merge pull request #42 from chef/hashThom May2016-09-022-2/+11
|\
| * allow a config context to be set from another config contexthashMatt Wrock2016-08-312-2/+11
* | Merge pull request #35 from KierranM/context-blocksThom May2016-09-023-5/+52
|\ \ | |/ |/|
| * Update README with details of context-blocksKierran McPherson2016-08-131-3/+22
| * Remove extraneous methodsKierran McPherson2016-08-131-10/+2
| * Also allow yielding the contextKierran McPherson2016-08-132-1/+19
| * Allow configuring contexts via blockKierran McPherson2016-08-132-2/+20
* | Merge pull request #41 from chef/bumpv2.2.3John Keiser2016-08-302-1/+11
|\ \
| * | release 2.2.3Matt Wrock2016-08-302-1/+11
|/ /
* | Merge pull request #40 from chef/restoreMatt Wrock2016-08-302-8/+35
|\ \
| * | restore by swapping in saved state instead of 'reset and merge'Matt Wrock2016-08-302-8/+35
|/ /
* | Merge pull request #39 from chef/rspec_3Tim Smith2016-08-241-0/+1
|\ \
| * | Ignore Gemfile.lockTim Smith2016-08-241-0/+1
* | | Add badgesTim Smith2016-08-241-0/+2
* | | Merge pull request #38 from chef/rspec_3Tim Smith2016-08-2414-313/+311
|\ \ \ | |/ /
| * | Correct typos in NOTICE filerspec_3Tim Smith2016-08-241-2/+2
| * | Format markdown and remove JIRA referenceTim Smith2016-08-231-17/+16