Add overlay for deep objects in security APIs

Author: lcawl

docs/overlays/elasticsearch-shared-overlays.yaml

@@ -244,6 +244,7 @@ actions:
         - name: watcher
           x-displayName: Watcher
 # Abbreviate and annotate items that are not shown in Bump.sh due to depth limits
+<<<<<<< HEAD:docs/overlays/elasticsearch-shared-overlays.yaml
   - target: "$.components['schemas']['ml._types:Datafeed'].properties.query"
     description: Remove query object from anomaly detection datafeed
     remove: true
@@ -313,6 +314,18 @@ actions:
         externalDocs:
           url: https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html
           description: Query DSL
+=======
+  - target: "$.components['schemas']['security._types:IndicesPrivilegesQuery'].oneOf"
+    description: Remove types from security role descriptors indices query
+    remove: true
+  - target: "$.components['schemas']['security._types:IndicesPrivilegesQuery']"
+    description: Re-add simplified types for security role descriptors indices query
+    update:
+      x-abbreviated: true
+      oneOf:
+        - type: string
+        - type: object
+>>>>>>> 295ccb76c (Add overlay for deep objects in security APIs):docs/overlays/elasticsearch-shared-example-overlays.yaml
 # Examples
   - target: "$.components['requestBodies']['async_search.submit']"
     description: "Add example for asynch search submit request"