diff options
| author | Joshua Hesketh <josh@nitrotech.org> | 2016-02-11 21:22:14 +1100 |
|---|---|---|
| committer | Joshua Hesketh <josh@nitrotech.org> | 2016-02-12 14:10:03 +1100 |
| commit | 89b67f617c87ca17aef8eac7e79f4252783ed60d (patch) | |
| tree | 6ead198fed5bd166808d1803f7d5022d80baa3e1 /.gitignore | |
| parent | afb9b2039ce366cc096bcea5b908cfc9181e6f6b (diff) | |
| parent | f760f0e49f0d45291afc6e5bee0041e87b17e865 (diff) | |
| download | zuul-89b67f617c87ca17aef8eac7e79f4252783ed60d.tar.gz | |
Merge master into feature/zuulv3
Conflicts:
zuul/connection/gerrit.py
zuul/lib/connections.py
zuul/model.py
zuul/scheduler.py
Change-Id: If1c8ac3bf26bd8c4496ac130958b966d9937519e
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 21a0a9fd3..f51678564 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.sw? *.egg *.egg-info *.pyc |