You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/01/28 09:02:15 UTC

[cloudstack] branch master updated (e6fef05 -> f989409)

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from e6fef05  Merge remote-tracking branch 'origin/4.15'
     add abec6d1  packaging: build and bundle UI using npm in deb and rpm packages (#4605)
     new f989409  Merge remote-tracking branch 'origin/4.15'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 INSTALL.md                                         |  6 +++
 client/pom.xml                                     |  3 +-
 debian/cloudstack-management.install               |  1 +
 .../cloudstack-ui.install                          |  6 +--
 debian/control                                     |  7 ++-
 debian/rules                                       | 14 ++++++
 packaging/centos7/cloud.spec                       | 29 +++++++++++
 packaging/centos8/cloud.spec                       | 29 +++++++++++
 pom.xml                                            | 56 +++++++++++-----------
 tools/travis/before_install.sh                     |  6 +++
 ui/{ => public}/error.html                         |  0
 11 files changed, 123 insertions(+), 34 deletions(-)
 copy core/src/main/resources/META-INF/cloudstack/allocator/module.properties => debian/cloudstack-ui.install (93%)
 rename ui/{ => public}/error.html (100%)


[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.15'

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit f98940953b1632d20aa68ca34439d01a6f359d64
Merge: e6fef05 abec6d1
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Thu Jan 28 14:31:04 2021 +0530

    Merge remote-tracking branch 'origin/4.15'

 INSTALL.md                                         |  6 +++
 client/pom.xml                                     |  3 +-
 debian/cloudstack-management.install               |  1 +
 ...ck-management.install => cloudstack-ui.install} | 22 +--------
 debian/control                                     |  7 ++-
 debian/rules                                       | 14 ++++++
 packaging/centos7/cloud.spec                       | 29 +++++++++++
 packaging/centos8/cloud.spec                       | 29 +++++++++++
 pom.xml                                            | 56 +++++++++++-----------
 tools/travis/before_install.sh                     |  6 +++
 ui/{ => public}/error.html                         |  0
 11 files changed, 123 insertions(+), 50 deletions(-)