shixiong/okd @ c84677a90bd168b804cae7e511747b7af30ce387

Devan Goodwin 9d05b8c192 Merge remote-tracking branch 'upstream/master' into upgrade		9 jaren geleden
..
__init__.py	df78d323c0 Add atomic-openshift-utils	9 jaren geleden
cli_installer_tests.py	2855bc043f Rename install_transactions module to openshift_ansible.	9 jaren geleden
oo_config_tests.py	3f28361fdf Remove my username from some test data.	9 jaren geleden