diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-11 16:15:40 -0500 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-11 16:15:40 -0500 |
| commit | 0944320b72ee1ab16a18a149f5ecb743ace0c0d3 (patch) | |
| tree | 1c70c6185a97a2e2bc7e9323651b920c28ab91fa /.gitignore | |
| parent | f00463d2f124221ef37aaab4d69e26778f349c61 (diff) | |
| parent | 8cefd66dd0aee8db3fd6ddcb348c6702e498785d (diff) | |
| download | chef-0944320b72ee1ab16a18a149f5ecb743ace0c0d3.tar.gz | |
Merge pull request #4369 from chef/ksubrama/omnibus
Migrate omnibus-chef project/software definitions for chef in here.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index c981191e4e..064d998d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,21 @@ .autotest coverage .DS_Store -pkg +pkg/* tags */tags *~ .chef -# you should check in your Gemfile.lock in applications, and not in gems +# You should check in your Gemfile.lock in applications, and not in gems +# This also matches Berksfile.lock external_tests/*.lock -*.lock -Gemfile.local +/*.lock +/Gemfile.local -# Do not check in the .bundle directory, or any of the files inside it. Those files are specific to each particular machine, and are used to persist installation options between runs of the bundle install command. +# Do not check in the .bundle directory, or any of the files inside it. Those +# files are specific to each particular machine, and are used to persist +# installation options between runs of the bundle install command. .bundle # ignore some common Bundler 'binstubs' directory names @@ -36,7 +39,6 @@ doc/ # Test Kitchen .kitchen/ -Berksfile.lock # Vagrant Vagrantfile |