diff options
| author | sersut <serdar@opscode.com> | 2013-05-14 11:49:16 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-05-14 11:49:16 -0700 |
| commit | eef83d8ab5943af1dd3b25ccc94ef71d772d945a (patch) | |
| tree | f1e3125e4ba6fdcfb08e0f5114758f0524494112 /lib/chef/file_access_control/unix.rb | |
| parent | 564ac7a3761fd870eb867b985b01273510115cf2 (diff) | |
| parent | 664ee74decc3b069269b4f079a3e7a86613b0af1 (diff) | |
| download | chef-eef83d8ab5943af1dd3b25ccc94ef71d772d945a.tar.gz | |
Merge branch 'master' into file-refactor
Conflicts:
spec/unit/knife/configure_spec.rb
spec/unit/provider/remote_file_spec.rb
Diffstat (limited to 'lib/chef/file_access_control/unix.rb')
0 files changed, 0 insertions, 0 deletions