Christopher Boumenot b8de835a91 merge conflicts		2018-07-11 14:54:57 -07:00
..
compute/mgmt/2018-04-01/compute	merge conflicts	2018-07-11 14:54:57 -07:00
network/mgmt/2018-01-01/network	merge conflicts	2018-07-11 14:54:57 -07:00
resources/mgmt	merge conflicts	2018-07-11 14:54:57 -07:00
storage/mgmt/2017-10-01/storage	merge conflicts	2018-07-11 14:54:57 -07:00