This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.12 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 73fd62a89d5c0eee56764dd970c5de8986fb4e4e Merge: ff23131 d108f32 Author: Rohit Yadav <[email protected]> AuthorDate: Fri Jun 7 09:35:56 2019 +0530 Merge remote-tracking branch 'origin/4.11' into 4.12 ...UploadTemplateDirectDownloadCertificateCmd.java | 9 ++------- scripts/util/keystore-cert-import | 23 +++++++++------------- scripts/util/keystore-setup | 8 +++++--- .../direct/download/DirectDownloadManagerImpl.java | 20 +++++++++++++------ 4 files changed, 30 insertions(+), 30 deletions(-) diff --cc server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java index d2aa675,9986093..9986093 mode 100644,100755..100644 --- a/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java
