diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-10-10 16:02:48 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-10-10 16:06:48 -0700 |
| commit | b5a9bfd10ad06311c1a8d0f4c296378bb9103978 (patch) | |
| tree | d1599004cce73e3d6377279ad677753644659448 /lib/chef/shef | |
| parent | 0fb570467abd6bc19871fa0373d0201c1432ecc5 (diff) | |
| parent | 95e1182b41aaf083b099d0fb251552f9f4691cf0 (diff) | |
| download | chef-b5a9bfd10ad06311c1a8d0f4c296378bb9103978.tar.gz | |
Merge branch 'suse-group' of github.com:mapleoin/chefsersut/rebase-chef-2187
Conflicts:
spec/unit/platform_spec.rb
Diffstat (limited to 'lib/chef/shef')
0 files changed, 0 insertions, 0 deletions