diff options
| author | Adam Jacob <adam@hjksolutions.com> | 2009-02-22 19:31:06 -0800 |
|---|---|---|
| committer | Adam Jacob <adam@hjksolutions.com> | 2009-02-22 19:31:06 -0800 |
| commit | c696e4cc193636ad0fa77fb7f2765ce5011f4418 (patch) | |
| tree | 14bb638e36b4c179321a0aaa0b5312b3df0cde07 /.gitignore | |
| parent | 986af85a675b5d234e65fd3935ad90f7c09eb670 (diff) | |
| parent | 639a253bf2d0897cd1d38e8c0811623cc12a5880 (diff) | |
| download | chef-c696e4cc193636ad0fa77fb7f2765ce5011f4418.tar.gz | |
Merge branch 'master' into seancribbs/CHEF-115
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 98d5c33e2e..86a1f94724 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ chef/pkg chef-server/pkg chef/log chef-server/log +features/data/tmp/** *.swp |