You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2019/06/04 12:51:11 UTC
[cloudstack] 01/01: Merge branch '4.12'
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 50869fec9208a8973d59e5d5831e241c50923646
Merge: 3e4c55c bea627a
Author: nvazquez <ni...@gmail.com>
AuthorDate: Tue Jun 4 09:49:39 2019 -0300
Merge branch '4.12'
agent/src/main/java/com/cloud/agent/Agent.java | 28 ---
...ploadTemplateDirectDownloadCertificateCmd.java} | 182 +++++++++--------
... => SetupDirectDownloadCertificateCommand.java} | 4 +-
...tupDirectDownloadCertificateCommandWrapper.java | 136 ++++++++++++
.../com/cloud/server/ManagementServerImpl.java | 4 +-
.../direct/download/DirectDownloadManagerImpl.java | 76 ++++++-
.../download/DirectDownloadManagerImplTest.java | 33 +++
test/integration/smoke/test_direct_download.py | 227 +++++++++++++++++++++
ui/l10n/en.js | 2 +-
9 files changed, 562 insertions(+), 130 deletions(-)