diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-02-01 15:57:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-01 15:57:36 -0600 |
| commit | 3e7787fc86c997679eb14e1a936336086177b438 (patch) | |
| tree | 51297cfb566d0e1f2e9623cca209ac7aa360b97e /.gitignore | |
| parent | f6c5d4ca41da66b933b600ae5a871624db92a68e (diff) | |
| parent | c9480811d2222693abe4460ca42c292b289a0ef4 (diff) | |
| download | openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.gz openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.bz2 openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.xz openshift-3e7787fc86c997679eb14e1a936336086177b438.zip | |
Merge branch 'master' into logging_fix_immutable_spec_changes
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d3fab9f1a..1e187db16 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ gce.ini multi_ec2.yaml .vagrant .tags* -/ansible.cfg *.retry .vscode/* .cache |