properties:
  <<: (( merge ))
  app_ssh:
    host_key_fingerprint: a6:d1:08:0b:b0:cb:9b:5f:c4:ba:44:2a:97:26:19:8a
    oauth_client_id: ssh-proxy
  cc:
    <<: (( merge ))
    allow_app_ssh_access: true
  uaa:
    <<: (( merge ))
    clients:
      <<: (( merge ))
      ssh-proxy:
        authorized-grant-types: authorization_code
        autoapprove: true
        override: true
        redirect-uri: /login
        scope: openid,cloud_controller.read,cloud_controller.write
        secret: ssh-proxy-secret

properties:
  <<: (( merge ))
  app_ssh:
    host_key_fingerprint: a6:d1:08:0b:b0:cb:9b:5f:c4:ba:44:2a:97:26:19:8a
    oauth_client_id: ssh-proxy
  cc:
    allow_app_ssh_access: true
  uaa:
    clients:
      <<: (( merge ))
      ssh-proxy:
        authorized-grant-types: authorization_code
        autoapprove: true
        override: true
        redirect-uri: /login
        scope: openid,cloud_controller.read,cloud_controller.write
        secret: ssh-proxy-secret

Remove ignored hash merges from cf-release stub
Remove ignored hash merges from cf-release stub

* cf-release manifest templates do not have upstream merges, so they are
* effectively meaningless

[#105611266]

Signed-off-by: Jen Spinney <475b118f8db4f150e7ed3b69b35fd7c857f9c9f8@hpe.com>
