diff options
| author | Claire McQuin <claire@getchef.com> | 2014-11-13 11:03:30 -0800 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-11-13 11:03:30 -0800 |
| commit | 38fec5d06578a54ac5016aebb6585ecb381e827c (patch) | |
| tree | 2d38d6d6c0f07a24ce5ee337cb2f1123834ab815 | |
| parent | d71978b6cac986a0403be83406925eb17c0f889c (diff) | |
| parent | 5e1eea3baaade28415d8a74bfd407d461be2240c (diff) | |
| download | chef-38fec5d06578a54ac5016aebb6585ecb381e827c.tar.gz | |
Merge branch 'audit-mode' into audit-mode-rebaseaudit-mode-rebase
Conflicts:
lib/chef/run_context.rb
0 files changed, 0 insertions, 0 deletions