Commit a0dddbf8 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF678' into 'STF678_Task2'

# Conflicts:
#   config/.meepctl-repocfg.yaml
parents 4ea9310b 8106334b
Loading
Loading
Loading
Loading
+1396 −826

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Changes for config/api/dai-api.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -382,9 +382,9 @@ paths:
              maxGracefulTimeout: 10
              _links:
                subscription:
                  href: http://mec011Server.example.com/mec_app_support/v1/applications/appId1234/subscriptions/sub123
                  href: http://mec011Server.example.com/mec_app_support/v2/applications/appId1234/subscriptions/sub123
                confirmTermination:
                  href: http://mec011Server.example.com/mec_app_support/v1/confirm_termination
                  href: http://mec011Server.example.com/mec_app_support/v2/confirm_termination
        required: true
      responses:
        "204":
+1901 −1229

File changed.

Preview size limit exceeded, changes collapsed.

+1772 −953

File changed.

Preview size limit exceeded, changes collapsed.

+2342 −984

File changed.

Preview size limit exceeded, changes collapsed.

Loading