Merge branch 'master' into 'soft_consolidation'

# Conflicts:
#   mkdocs.yml

parents 2ac17e4b bd4f62ad

No related branches found

No related tags found

5 merge requests!368Update prace.md to document the change from qprace to qprod as the default...,!367Update prace.md to document the change from qprace to qprod as the default...,!366Update prace.md to document the change from qprace to qprod as the default...,!323extended-acls-storage-section,!25Soft consolidation

Pipeline #

Status	Pipeline	Created by	Stages	Actions
Warning 00:00:56 Jan 19, 2017	Merge branch 'master' into 'soft_consolidation' #1513 soft_consolidation 9538bfea		Stage: test Stage: build Stage: deploy	Download artifacts No artifacts found