shixiong/okd @ c92c263aadf1346cb7e8f41e943b48ffd45e20f2

Sylvain Baubeau c92c263aad Properly set use_flannel fact		%!s(int64=9) %!d(string=hai) anos
..
openshift-cluster	5c57f251e5 Merge pull request #1020 from abutcher/pre-3.1-dnsip	%!s(int64=9) %!d(string=hai) anos
openshift-etcd	8741b61d46 Replace map with oo_collect to support python-jinja2 <2.7	%!s(int64=9) %!d(string=hai) anos
openshift-master	ffb663f5f6 Merge pull request #983 from enoodle/manageiq_service	%!s(int64=9) %!d(string=hai) anos
openshift-node	c92c263aad Properly set use_flannel fact	%!s(int64=9) %!d(string=hai) anos