shixiong/okd @ 6a7b20e72b9692b298ac8c911bf78128e115955b

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