Merge remote-tracking branch 'origin/master'

# Conflicts:
#	releases/gcube-4.15.0.yaml
This commit is contained in:
Manuele Simi 2019-10-09 15:04:20 -04:00
commit 7fbb9ffaa5
1 changed files with 25 additions and 25 deletions

View File

@ -57,8 +57,8 @@ gCube_release:
version: 1.1.2
- name: accounting-dashboard-harvester-se-plugin
version: 1.2.0
# - name: social-data-indexer-se-plugin #ticket set to new #17310
# version: 1.3.0
# - name: social-data-indexer-se-plugin #ticket set to new #17310
# version: 1.3.0
Services:
- name: gcat
@ -67,8 +67,8 @@ gCube_release:
version: 1.2.0
- name: storagehub
version: 1.0.8
# - name: social-networking-library-ws
# version: 2.3.0
# - name: social-networking-library-ws
# version: 2.3.0
- name: oauth-service
version: 1.2.0
- name: uri-resolver
@ -81,8 +81,8 @@ gCube_release:
Portlets:
- name: NONE
# - name: my-vres
# version: 2.6.0
# - name: my-vres
# version: 2.6.0
Distribution:
- name: smartgears-distribution