summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix unit test stublcg/node-utf8-sanitizeLamont Granquist2015-05-011-1/+1
* add a spec test + linebreaksLamont Granquist2015-05-012-1/+14
* use validate_utf8=false option to json encoder for nodeLamont Granquist2015-05-013-3/+8
* Merge pull request #3295 from chef/lcg/dont-mutate-new-resourceLamont Granquist2015-05-016-18/+64
|\
| * add CHANGELOGlcg/dont-mutate-new-resourceLamont Granquist2015-05-011-0/+2
| * break up spec examplesLamont Granquist2015-05-011-3/+23
| * test state_for_resource_reporter on file resourceLamont Granquist2015-05-012-2/+4
| * create Chef::Resource#state_for_resource_reporterLamont Granquist2015-05-014-12/+36
| * fix specsLamont Granquist2015-05-011-2/+3
| * don't mutate the new resourceLamont Granquist2015-05-011-3/+0
|/
* Merge pull request #3227 from higanworks/show_chef_version_on_shellThom May2015-05-012-4/+4
|\
| * Merge remote-tracking branch 'upstream/master' into show_chef_version_on_shellsawanoboly2015-04-221-0/+6
| |\
| * | reflect https://github.com/chef/chef/pull/3227#issuecomment-94560685sawanoboly2015-04-212-4/+4
| * | Merge branch 'master' into show_chef_version_on_shellsawanoboly2015-04-2135-215/+1695
| |\ \
| * | | Show Chef::VERSION at prompt_c and prompt_i on shell sessionsawanoboly2015-04-152-8/+8
* | | | Merge pull request #3311 from chef/tc/key-editTyler Cloke2015-04-3016-30/+1030
|\ \ \ \
| * | | | Implemented `knife user key show` and `knife client key show`.tylercloke2015-04-3011-59/+344
| * | | | Fixed small bug in Chef::Key.load_by_(user|client) where actor wasn't populated.tylercloke2015-04-301-3/+5
| * | | | Implemented `knife user key edit` and `knife client key edit`.tylercloke2015-04-309-20/+684
| * | | | Fixed a bug where create_key would conflict with public_key in hash returned ...tylercloke2015-04-302-0/+30
| * | | | Changes Chef::Key update to allow updating the name of a key.tylercloke2015-04-302-5/+24
* | | | | Changelog entry for #3316Jay Mundrawala2015-04-301-0/+1
* | | | | Merge pull request #3317 from chef/jdm/winstaller-idempotentJay Mundrawala2015-04-301-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | windows_package is idempotent againjdm/winstaller-idempotentJay Mundrawala2015-04-301-1/+1
|/ / / /
* | | | Merge pull request #3314 from chef/tball/tk14Tyler Ball2015-04-301-2/+2
|\ \ \ \
| * | | | Updating to released test kitchen and kitchen vagranttyler-ball2015-04-301-2/+2
|/ / / /
* | | | Note @igorshp's contributionThom May2015-04-301-0/+2
* | | | Update changelog for releasesThom May2015-04-303-66/+7
* | | | Merge pull request #3207 from Igorshp/exception_handlersThom May2015-04-303-6/+17
|\ \ \ \
| * | | | cleaned up rspec testIgor Shpakov2015-04-211-5/+1
| * | | | revised rspec testIgor Shpakov2015-04-201-9/+6
| * | | | updated based on @lamont-granquist commentsIgor Shpakov2015-04-132-2/+1
| * | | | do not overwrite whole @run_status in #build_nodeIgor Shpakov2015-04-112-6/+5
| * | | | small tweak to wordingIgor Shpakov2015-04-091-1/+1
| * | | | added rspec testIgor Shpakov2015-04-091-0/+20
| * | | | patch to always run exception handlersIgor Shpakov2015-04-091-1/+1
* | | | | Merge pull request #3306 from chef/tc/key-deleteTyler Cloke2015-04-297-3/+365
|\ \ \ \ \
| * | | | | Implemented `knife user key delete` and `knife client key delete`.tylercloke2015-04-297-3/+365
|/ / / / /
* | | | | Merge pull request #3235 from jaymzh/yum_archPhil Dibowitz2015-04-294-32/+101
|\ \ \ \ \
| * | | | | Make multipackage and arch play nicely togetherPhil Dibowitz2015-04-294-32/+101
* | | | | | Merge pull request #3297 from chef/tc/key-listTyler Cloke2015-04-298-39/+644
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Implemented `knife user key list` and `knife client key list`.tc/key-listtylercloke2015-04-298-39/+644
|/ / / / /
* | | | | Merge pull request #3301 from chef/revert-3296-disable-travis-containersJulian C. Dunn2015-04-291-0/+1
|\ \ \ \ \
| * | | | | Revert "Disable Travis CI container infrastructure due to broken IPv6 support"revert-3296-disable-travis-containersJulian C. Dunn2015-04-291-0/+1
|/ / / / /
* | | | | Merge pull request #3296 from juliandunn/disable-travis-containersJulian C. Dunn2015-04-281-1/+0
|\ \ \ \ \
| * | | | | Disable Travis CI container infrastructure due to broken IPv6 support:Julian C. Dunn2015-04-281-1/+0
|/ / / / /
* | | | | Merge pull request #3260 from chef/jdm/kitchen-appbundleJay Mundrawala2015-04-283-32/+28
|\ \ \ \ \
| * | | | | Use kitchen-appbundle-updaterjdm/kitchen-appbundleJay Mundrawala2015-04-283-32/+28
* | | | | | Merge pull request #3271 from chef/tc/create-keyTyler Cloke2015-04-2810-8/+634
|\ \ \ \ \ \
| * | | | | | Implemented `knife user key create` and `knife client key create`.tylercloke2015-04-289-6/+596
View Lorry Controller Status