Commit c9f6bdbc authored by Jason Cloud's avatar Jason Cloud
Browse files

Resolve merge conflicts

parent 5368340e

TS26512_Mas_Configuration_ContentHosting.yaml

+3 −9
Original line number Diff line number Diff line 
openapi: 3.0.0

info:

  title: Mas_Configuration_ContentHosting

  version: 1.0.2

  version: 1.1.0

  description: |

    5GMS AS Configuration API: Content Hosting

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,7 +12,7 @@ tags: 
    description: '5G Media Streaming: Application Server Configuration (M3) APIs: Content Hosting'



externalDocs:

  description: 'TS 26.512 V18.6.0; 5G Media Streaming (5GMS); Protocols'

  description: 'TS 26.512 V19.0.0; 5G Media Streaming (5GMS); Protocols'

  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/'



servers:
@@ -335,16 +335,10 @@ components: 
      allOf:

        - $ref: 'TS26510_Maf_Provisioning_ContentHosting.yaml#/components/schemas/BaseDistributionConfiguration'

        - type: object

          required:

            - canonicalDomainName

            - baseURL

          properties:

            canonicalDomainName:

              type: string

              description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.'

            baseURL:

              allOf:

                - $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl'

              description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4 and M10.'



    # Schema for the resource itself

    ApplicationServerContentHostingConfiguration: