Merge remote-tracking branch 'origin/master' into asf-site
Signed-off-by: Rohit Yadav <rohit@apache.org>
diff --git a/content/api.html b/content/api.html
index 9aa05dd..7a4dc82 100644
--- a/content/api.html
+++ b/content/api.html
@@ -148,7 +148,7 @@
<h2 id="x">4.11.x</h2>
<ul>
- <li><a href="api/apidocs-4.11/">All API</a></li>
+ <li><a href="api/apidocs-4.11/index.html">All API</a></li>
</ul>
<h2 id="x-1">4.10.x</h2>
diff --git a/content/archives.html b/content/archives.html
index 2523630..9440a27 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -127,7 +127,12 @@
<h2 id="indicators">Archived Releases</h2>
<ul>
- <li>4.1
+ <li>4.11
+ <ul>
+ <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2">apache-cloudstack-4.11.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.sha">SHA512</a> ]</li>
+ </ul>
+ </li>
+ <li>4.10
<ul>
<li><a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2">apache-cloudstack-4.10.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2.sha">SHA512</a> ]</li>
</ul>
diff --git a/content/developers.html b/content/developers.html
index 38f7bf4..a6c1f1c 100644
--- a/content/developers.html
+++ b/content/developers.html
@@ -156,7 +156,7 @@
<p>Apache CloudStack has a read-only mirror on <a href="https://github.com/apache/cloudstack" target="_blank">GitHub</a> that is kept in sync with the canonical Git repo maintained by the Apache Software Foundation. Submitting GitHub pull requests is the easiest way to get your contribution upstream. For detailed instructions see the link below:</p>
-<br /><a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a></br>
+<br /><a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a>
<h3>Submitting a patch through JIRA</h3>
diff --git a/content/downloads.html b/content/downloads.html
index 5333df7..5669b23 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -145,11 +145,10 @@
<div class="col-lg-6">
<h2>Latest CloudStack Releases</h2>
-<p>The CloudStack community maintains two release types; the 'main' releases and the LTS (Long Term Support) releases. The LTS releases receive bug and security fixes for a period of two years (more details here <a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/LTS"><i>CloudStack Wiki</i></a>). The main releases receive only critical bug fixes for a short period. The general expectation is that the users of the 'main' will upgrade to a new version in order to receive fixes</p>
-<br />
+<p>The CloudStack community maintains two types of releases; the main releases and the LTS (Long Term Support) releases. The LTS releases receive bug and security fixes for a period of two years (for more details <a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/LTS"><i>click here</i></a>). The main releases receive only critical bug fixes for a short period. The general expectation is that the users of the 'main' will upgrade to a new version in order to receive fixes.</p>
+
<h3>Source Releases</h3>
-<p>Currently, the latest release is an LTS release. The next main release will start preparation at the begining of May 2018</p>
-<p>Apache CloudStack's most recent release is 4.11.0.0.
+<p>Apache CloudStack's most recent release is 4.11.0.0 and is an LTS release.
</p>
<p>
@@ -179,14 +178,16 @@
</button>
</a>
</p>
-<br />
-<p>Apache CloudStack's current LTS release is 4.11.0.0.
+
+<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/4.11.0.0/">version 4.11.0.0 Release Notes</a> website.</p><br />
+
+<p>Apache CloudStack's previous LTS release was 4.9.3.0.
</p>
<p>
- <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2">
+ <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2">
<button type="button" class="btn btn-primary btn-md">
- Get the 4.11.0.0 Source
+ Get the 4.9.3.0 Source
</button>
</a>
<a href="http://www.apache.org/dist/cloudstack/KEYS">
@@ -194,26 +195,26 @@
KEYS
</button>
</a>
- <a href="http://www.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.asc">
+ <a href="http://www.apache.org/dist/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2.asc">
<button type="button" class="btn btn-info btn-xs">
PGP
</button>
</a>
- <a href="http://www.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.md5">
+ <a href="http://www.apache.org/dist/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2.md5">
<button type="button" class="btn btn-info btn-xs">
MD5
</button>
</a>
- <a href="http://www.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.sha512">
+ <a href="http://www.apache.org/dist/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2.sha512">
<button type="button" class="btn btn-info btn-xs">
SHA512
</button>
</a>
</p>
-<br />
-<p>Instructions for building from source and installing Apache CloudStack can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/">Installation Guide</a>.<br />
-Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack 4.11.0.0 can be found in the upgrade section of the Release Notes (see below).</p>
+<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/4.9.3.0/">version 4.9.3.0 Release Notes</a> website.</p>
+
+<p>Instructions for building from source and installing Apache CloudStack can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/">Installation Guide</a>. Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack 4.11.0.0 can be found in the upgrade section of the Release Notes (see above).</p>
</div>
@@ -272,24 +273,12 @@
</ul>
<p>Instructions for using these community provided repositories can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/management-server/index.html#configure-package-repository">Configure Package Repository</a> section of the Installation Guide.</p>
-<p><br /></p>
<h4>Packages hosted by 3rd Parties</h4>
<ul>
- <li>CloudStack Packages by ShapeBlue: <a href="http://shapeblue.com/packages/">http://shapeblue.com/packages</a></li>
+ <li>CloudStack (noredist) Packages by ShapeBlue: <a href="http://shapeblue.com/packages/">http://shapeblue.com/packages</a></li>
</ul>
-<p><br /></p>
-<h3>Release Notes</h3>
-<h4>4.11.0.0</h4>
-
-<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/4.11/">Version 4.11 Release Notes</a> document.</p>
-
-<h4>4.11.0.0</h4>
-
-<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/4.11/">Version 4.11 Release Notes</a> document.</p>
-
-<p><a name="cloudmonkey"></a></p>
<div class="row">
@@ -297,7 +286,7 @@
<div class="page-header">
-<h2 id="indicators">Latest CloudMonkey Release</h2>
+<h2 id="cloudmonkey">Latest CloudMonkey Release</h2>
</div>
@@ -353,7 +342,7 @@
<h2 id="indicators">Archived Releases</h2>
-You can find links to older releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
+You can find links to all the releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
</div></div></div>
diff --git a/content/images/favicon.ico b/content/images/favicon.ico
new file mode 100644
index 0000000..d9c53d6
--- /dev/null
+++ b/content/images/favicon.ico
Binary files differ
diff --git a/content/who.html b/content/who.html
index 51eb24a..b3e2dfb 100644
--- a/content/who.html
+++ b/content/who.html
@@ -169,10 +169,6 @@
<td>Animesh</td>
</tr>
<tr>
- <td>bhaisaab</td>
- <td>Rohit Yadav</td>
- </tr>
- <tr>
<td>boris</td>
<td>Boris Schrijver</td>
</tr>
@@ -305,6 +301,10 @@
<td>Remi Bergsma</td>
</tr>
<tr>
+ <td>rohit</td>
+ <td>Rohit Yadav</td>
+ </tr>
+ <tr>
<td>sebgoa</td>
<td>Sebastien Goasguen</td>
</tr>
@@ -390,10 +390,6 @@
<td>Brian Federle</td>
</tr>
<tr>
- <td>bhaisaab</td>
- <td>Rohit Yadav</td>
- </tr>
- <tr>
<td>boris</td>
<td>Boris Schrijver</td>
</tr>
@@ -694,6 +690,10 @@
<td>Rene Moser</td>
</tr>
<tr>
+ <td>rohit</td>
+ <td>Rohit Yadav</td>
+ </tr>
+ <tr>
<td>sailajamada</td>
<td>Sailaja Mada</td>
</tr>
