shixiong/okd @ f894bcf6e7f1121cc024b2ff6a66db54740e02db

Giuseppe Scrivano 9c29b47f78 container-engine: log-opts is a dictionary in the daemon.json file		7 rokov pred
..
oo_filters.py	9c29b47f78 container-engine: log-opts is a dictionary in the daemon.json file	7 rokov pred
openshift_version.py	346ce4fc59 Removed old version code	7 rokov pred