diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-14 12:33:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 12:33:29 -0500 |
| commit | a59820e01fd49fb1d50867571574fb20f3ce2692 (patch) | |
| tree | c3e2d033e3db7a51a5c2f1db2d12464357989c05 /roles/kuryr/templates/cni-daemonset.yaml.j2 | |
| parent | 912123dbfbf8186e1b661782c7572ee94378bd6d (diff) | |
| parent | d227dc7233cb7adf34da619da6f6a3bed2eaac18 (diff) | |
| download | openshift-a59820e01fd49fb1d50867571574fb20f3ce2692.tar.gz openshift-a59820e01fd49fb1d50867571574fb20f3ce2692.tar.bz2 openshift-a59820e01fd49fb1d50867571574fb20f3ce2692.tar.xz openshift-a59820e01fd49fb1d50867571574fb20f3ce2692.zip | |
Merge pull request #6466 from mgugino-upstream-stage/journald-vars-to-defaults
Combine openshift_master/vars with defaults
Diffstat (limited to 'roles/kuryr/templates/cni-daemonset.yaml.j2')
0 files changed, 0 insertions, 0 deletions