migrate openstack

ansible · Jan 28, 2020 · 773df3e · 773df3e
1 parent 6901c9c
commit 773df3e
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
@@ -151,6 +151,7 @@ files:
     ignored: andyhky
   $modules/cloud/opennebula/: ilicmilan xorel rsmontero meerkampdvv
   $modules/cloud/openstack/: $team_openstack
+<<<<<<< HEAD
   $modules/cloud/openstack/os_auth.py:
     migrated_to: openstack.cloud
   $modules/cloud/openstack/os_client_config.py:
@@ -258,6 +259,8 @@ files:
   $modules/cloud/openstack/os_volume_snapshot.py:
     migrated_to: openstack.cloud
   $modules/cloud/openstack/os_zone.py:
+=======
+>>>>>>> migrate openstack
     migrated_to: openstack.cloud
   $modules/cloud/oracle/: &oracle
     labels: [ cloud, oracle ]
@@ -1627,11 +1630,16 @@ files:
     maintainers: bvitnik
   $plugins/doc_fragments/hpe3par.py: *hpe3par
   $plugins/doc_fragments/oracle*: *oracle
+<<<<<<< HEAD
   $plugins/doc_fragments/service_now.py:
     migrated_to: servicenow.servicenow
   $plugins/doc_fragments/f5.py:
     maintainers: caphrim007 wojtek0806
     migrated_to: f5networks.f5_modules
+=======
+  $plugins/doc_fragments/openstack.py:
+    migrated_to: openstack.cloud
+>>>>>>> migrate openstack
 ###############################
 # plugins/filter
   $plugins/filter/: