You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2020/05/01 21:58:32 UTC

[cloudstack-www] branch asf-site updated (8cc8c00c -> d4114c7)

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

andrijapanic pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git.


    from 8cc8c00c updated PR69 to include compiled content
     add ad74142  Remove Safe Swiss Cloud as a known user (#71)
     add 7e76f72  added hypergrid (#70)
     add 1dbb391  Update version to 4.13.1.0 (#74)
     add 2ad566e  Release 4.13.1.0 update
     new d4114c7  fix merge conflict on index.html and download.html

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:
 content/archives.html              |  5 +++++
 content/downloads.html             | 18 +++++++++---------
 content/index.html                 |  4 ++--
 content/users.html                 |  2 +-
 data/acs-events.csv                |  7 ++++---
 data/cloudstack.yml                | 10 +++++-----
 source/downloads.html.markdown.erb |  2 +-
 source/users.html.markdown         |  2 +-
 8 files changed, 28 insertions(+), 22 deletions(-)


[cloudstack-www] 01/01: fix merge conflict on index.html and download.html

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

andrijapanic pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git

commit d4114c761e8a248de0207560e2ad9e9bc7903e70
Merge: 8cc8c00c 2ad566e
Author: andrijapanicsb <an...@shapeblue.com>
AuthorDate: Fri May 1 22:55:14 2020 +0100

    fix merge conflict on index.html and download.html

 content/archives.html              |  5 +++++
 content/downloads.html             | 18 +++++++++---------
 content/index.html                 |  4 ++--
 content/users.html                 |  2 +-
 data/acs-events.csv                |  7 ++++---
 data/cloudstack.yml                | 10 +++++-----
 source/downloads.html.markdown.erb |  2 +-
 source/users.html.markdown         |  2 +-
 8 files changed, 28 insertions(+), 22 deletions(-)

diff --cc content/archives.html
index a8863e1,e4c1cd0..6db2b3e
--- a/content/archives.html
+++ b/content/archives.html
@@@ -123,9 -123,9 +123,14 @@@
              <h2 id="indicators">Archived Releases</h2>
  
  <ul>
+   <li>4.13
+     <ul>
+       <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2">apache-cloudstack-4.13.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-clo [...]
++    </ul>
++  </li>
 +  <li>4.12
 +    <ul>
 +      <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2">apache-cloudstack-4.13.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-clo [...]
      </ul>
    </li>
    <li>4.12