This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 8b6824a update asf-site from master branch source
8b6824a is described below
commit 8b6824ada4952acbc5cb2f423e630bf0f14b3f81
Author: Paul Angus <[email protected]>
AuthorDate: Mon Nov 26 14:52:15 2018 +0000
update asf-site from master branch source
---
README.md | 10 +++-
content/archives.html | 1 +
content/developers.html | 133 ++++++++++++++++++++++++++++++++++-----------
content/downloads.html | 16 +++---
content/index.html | 22 ++++----
content/users.html | 11 ++--
data/cloudstack.yml | 6 +-
source/developers.markdown | 133 ++++++++++++++++++++++++++++++++++-----------
source/index.html.erb | 26 +++++----
source/users.markdown | 11 ++--
10 files changed, 263 insertions(+), 106 deletions(-)
diff --git a/README.md b/README.md
index 8174c4d..5455d02 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,15 @@ This is built using [middleman](https://middlemanapp.com)
$ gem install middleman
$ bundle install
-All sources are in the `/source` directory
+All sources are located in the `/source` directory. The build process requires
JavaScript engine to be installed. For Ubuntu Linux use:
+
+```bash
+sudo apt-get update
+sudo apt install nodejs
+```
+
+For more details look at:
+https://github.com/sstephenson/execjs/issues/71
Build the site with:
diff --git a/content/archives.html b/content/archives.html
index 5b5f9d5..585c481 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -133,6 +133,7 @@
<ul>
<li>4.11
<ul>
+ <li><a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2";>apache-cloudstack-4.11.2.0.src.tar.bz2</a>
[ <a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2.asc";>PGP</a>
][ <a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2.md5";>MD5</a>
][ <a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-clou
[...]
<li><a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2";>apache-cloudstack-4.11.1.0.src.tar.bz2</a>
[ <a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.asc";>PGP</a>
][ <a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.md5";>MD5</a>
][ <a
href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-clou
[...]
<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-clou
[...]
</ul>
diff --git a/content/developers.html b/content/developers.html
index 7e3fe97..f09f47f 100644
--- a/content/developers.html
+++ b/content/developers.html
@@ -158,9 +158,10 @@
</ul>
</p>
-<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>
+<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:<br />
+<a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md";
target="_blank">GitHub Contribution Guidelines</a></p>
<h3>Submitting a patch through JIRA</h3>
@@ -172,56 +173,123 @@
<p>In short, communication is a vital part of making a contribution to an
Apache project.</p>
-<h3> Getting Started </h3>
+<h3>Getting Started</h3>
+
+<h4>Fork the code</h4>
+
+<p>In your browser, navigate to: <a
href="https://github.com/apache/cloudstack";>https://github.com/apache/cloudstack</a>.</p>
-<p>First, lets make sure that you've added your name and email to your
`~/.gitconfig`:</p>
+<p>Fork the repository by clicking on the 'Fork' button on the top right hand
side. The fork will happen and you will be taken to your own
+fork of the repository. Copy the Git repository URL by clicking on the
clipboard next to the URL on the right hand side of the page under
'<b>HTTPS</b> clone URL'.
+You will paste this URL when doing the following <code>git clone</code>
command.</p>
+
+On your computer, follow these steps to setup a local repository for working
on ACS:
<pre>
-$ git config --global user.name "Your Name"
-$ git config --global user.email [email protected]
+$ git clone https://github.com/YOUR_ACCOUNT/cloudstack.git
+$ cd cloudstack
+$ git remote add upstream https://github.com/apache/cloudstack.git
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
</pre>
-<p>You'll grab the CloudStack source with git:</p>
+<h4>Making Changes</h4>
+
+<p>It is important that you create a new branch to make changes on and that
you do not change the
+<code>master</code> branch (other than to rebase in changes from
<code>upstream/master</code>). In this example I will assume you will be
making your changes
+to a branch called <code>feature_x</code>. This <code>feature_x</code> branch
will be created on your local repository and will be pushed to your
+forked repository on GitHub. Once this branch is on your fork you will create
a Pull Request for the changes to be added to the ACS project.</p>
+
+<p>It is best practice to create a new branch each time you want to contribute
to the project and only track the changes for that pull request in this
branch.</p>
<pre>
-$ git clone https://gitbox.apache.org/repos/asf/cloudstack.git
+$ git checkout -b feature_x
+ (make your changes)
+$ git status
+$ git add .
+$ git commit -a -m "descriptive commit message for your changes"
</pre>
-<p>If you already have the source, make sure you're working with the most
recent version. Do a `git pull` if you cloned the source more than a few hours
ago. (Apache CloudStack development can move pretty fast!)</p>
+<blockquote>The <code>-b</code> specifies that you want to create a new branch
called <code>feature_x</code>. You only specify <code>-b</code> the first time
you
+checkout because you are creating a new branch. Once the
<code>feature_x</code> branch exists, you can later switch to it with only
<code>git checkout feature_x</code>.</blockquote>
+
+<h4>Rebase <code>feature_x</code> to include updates from
<code>upstream/master</code></h4>
+
+<p>It is important that you maintain an up-to-date <code>master</code> branch
in your local repository. This is done by rebasing in the code
+changes from <code>upstream/master</code> (the official ACS project
repository) into your local repository. You will want to do this before you
start
+working on a feature as well as right before you submit your changes as a pull
request. We recommend you do this process periodically while you work to make
+sure you are working off the most recent project code.</p>
+
+<p>This process will do the following:</p>
+
+<ol>
+ <li>Checkout your local <code>master</code> branch;</li>
+ <li>Synchronize your local <code>master</code> branch with the
<code>upstream/master</code> so you have all the latest changes from the
project;</li>
+ <li>Rebase the latest project code into your <code>feature_x</code> branch
so it is up-to-date with the upstream code.</li>
+</ol>
<pre>
-$ git checkout -b mybranch
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
+$ git checkout feature_x
+$ git rebase master
</pre>
-<p>This does two things: One, it creates the branch <em>mybranch</em> and two,
it changes your working branch to <em>mybranch</em>. Running `git branch` will
show you which branch you're working on, with an asterisk next to the active
branch, like so:</p>
+<blockquote>Now your <code>feature_x</code> branch is up-to-date with all the
code in <code>upstream/master</code>.</blockquote>
+
+<h4>Make a GitHub pull request to contribute your changes</h4>
+
+<p>When you are happy with your changes and you are ready to contribute them,
you will create a Pull Request on GitHub to do so.
+This is done by pushing your local changes to your forked repository (default
remote name is <code>origin</code>) and then initiating a pull request on
GitHub.</p>
+
+<p>Please include JIRA ID or GitHub ID, detailed information about the
bug/feature, what all tests are executed, how the reviewer can test this
+feature etc. Incase of UI PRs, a screenshot is preferred.</p>
+
+<blockquote><b>IMPORTANT:</b>Make sure you have rebased your
<code>feature_x</code> branch to include the latest code from
<code>upstream/master</code> <b>before</b>
+you do this.</blockquote>
<pre>
-[user@localhost cloudstack]$ git branch
- master
- * mybranch
- </pre>
+$ git push origin master
+$ git push origin feature_x
+</pre>
-<p>Make whatever changes you're going to make, be sure to use <code>git
add</code> to stage the changes, and then you're going to commit the changes to
your working branch:</p>
+<p>Now that the <code>feature_x</code> branch has been pushed to your GitHub
repository, you can initiate the pull request.</p>
-<pre>git commit -m "Insert a meaningful summary of changes here."</pre>
+<p>To initiate the pull request, do the following:</p>
-<p>Finally, you can create a patch and attach it to the JIRA issue that you
created for the bug you are fixing.</p>
+<ol>
+<li>In your browser, navigate to your forked repository:
<b>https://github.com/YOUR_ACCOUNT/cloudstack</b>;</li>
+<li>Click the new button called '<b>Compare & pull request</b>' that
showed up just above the main area in your forked repository;</li>
+<li>Validate the pull request will be into the upstream <code>master</code>
and will be from your <code>feature_x</code> branch;</li>
+<li>Enter a detailed description of the work you have done and then click
'<b>Send pull request</b>'.</li>
+</ol>
-<pre>git format-patch master --stdout > ~/patch-name.patch</pre>
+<p>If you are requested to make modifications to your proposed changes, make
the changes locally on your <code>feature_x</code> branch, re-push
+the <code>feature_x</code> branch to your fork. The existing pull request
should automatically pick up the change and update accordingly.</p>
-<h3>Review</h3>
+<h4>Cleaning up after a successful pull request</h4>
-<p>Once you've submitted your pull request, you should receive a response
within a few days. If you receive no response within a week, please ping the
cloudstack-dev mailing list ([email protected]).</p>
+<p>Once the <code>feature_x</code> branch has been committed into the
<code>upstream/master</code> branch, your local <code>feature_x</code> branch
+and the <code>origin/feature_x</code> branch are no longer needed. If you want
to make additional changes, restart the process with a new branch.</p>
-<h3>Screencast</h3>
+<blockquote><b>IMPORTANT:</b>Make sure that your changes are in
<code>upstream/master</code>before you delete your <code>feature_x</code>
+and <code>origin/feature_x</code> branches!</blockquote>
-<p>If you are new to git you might want to watch this screencast:</p>
+<p>You can delete these deprecated branches with the following:</p>
-<iframe width="560" height="315"
src="//www.youtube.com/embed/3c5JIW4onGk?list=PLb899uhkHRoZCRE00h_9CRgUSiHEgFDbC"
frameborder="0" allowfullscreen=""></iframe>
+<pre>
+$ git checkout master
+$ git branch -D feature_x
+$ git push origin :feature_x
+</pre>
<h3>Further Reading</h3>
-<p>You might want to peruse the <a
href="http://www.apache.org/foundation/getinvolved.html"; target="_blank">Get
Involved</a> page on Apache.org, and the <a
href="http://commons.apache.org/patches.html"; target="_blank">On Contributing
Patches</a> doc as well. Note that some of that does not apply to Apache
CloudStack, as we're using git rather than Subversion. But do respect the
original style of the CloudStack code, and ensure that you're using spaces
rather than tabs, and your patches h [...]
+<p>You might want to peruse the <a
href="http://www.apache.org/foundation/getinvolved.html"; target="_blank">Get
Involved</a> page on Apache.org.
+Please, respect the original style of the CloudStack code, and ensure that
you're using spaces rather than tabs, and your code have Unix line
+endings (LF) rather than Windows-type line endings (CRLF).</p>
</div>
@@ -256,7 +324,7 @@ $ git checkout -b mybranch
<div class="panel-heading">
-<h3 class="panel-title">Git Repositories</h3>
+<h3 class="panel-title">CloudStack Git Repositories</h3>
</div>
@@ -267,18 +335,17 @@ $ git checkout -b mybranch
<ul>
<li><a href="https://gitbox.apache.org/repos/asf/cloudstack.git";
target="_blank">Apache CloudStack source code</a></li>
<li><a href="https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git";
target="_blank">Apache CloudStack Cloudmonkey source code</a></li>
-<li><a href="https://github.com/apache/cloudstack-ec2stack";
target="_blank">Apache CloudStack EC2stack Inteface</a></li>
-<li><a href="https://github.com/apache/cloudstack-gcestack";
target="_blank">Apache CloudStack GCEstack Interface</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs";
target="_blank">General Documentation</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-install";
target="_blank">Installation Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-admin";
target="_blank">Administrative Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-rn";
target="_blank">Release Notes</a></li>
+<li><a href="https://github.com/apache/cloudstack-documentation";
target="_blank">Documentation</a></li>
<li><a href="https://github.com/apache/cloudstack-www"; target="_blank">Apache
CloudStack Website</a></li>
</ul>
<p>To get the most recent source for Apache CloudStack, use:</p>
<pre>
+git clone https://github.com/apache/cloudstack.git
+</pre>
+or
+<pre>
git clone https://gitbox.apache.org/repos/asf/cloudstack.git
</pre>
diff --git a/content/downloads.html b/content/downloads.html
index d3b618d..ff6152c 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -152,13 +152,13 @@
<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>Apache CloudStack's most recent release is 4.11.1.0 and is an LTS release.
+<p>Apache CloudStack's most recent release is 4.11.2.0 and is an LTS release.
</p>
<p>
- <a
href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2";>
+ <a
href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2";>
<button type="button" class="btn btn-primary btn-md">
- Get the 4.11.1.0 Source
+ Get the 4.11.2.0 Source
</button>
</a>
<a href="http://www.apache.org/dist/cloudstack/KEYS";>
@@ -166,24 +166,24 @@
KEYS
</button>
</a>
- <a
href="http://www.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.asc";>
+ <a
href="http://www.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.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.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.md5";>
+ <a
href="http://www.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.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.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.sha512";>
+ <a
href="http://www.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2.sha512";>
<button type="button" class="btn btn-info btn-xs">
SHA512
</button>
</a>
</p>
-<p>Full release notes can be found in the <a
href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/4.11.1.0/";>version
4.11.1.0 Release Notes</a> website.</p><br />
+<p>Full release notes can be found in the <a
href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/4.11.2.0/";>version
4.11.2.0 Release Notes</a> website.</p><br />
<p>Apache CloudStack's previous LTS release was 4.9.3.1.
</p>
@@ -218,7 +218,7 @@
<p>Full release notes can be found in the <a
href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/4.9.3.1/";>version
4.9.3.1 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.1.0 can be found in the upgrade
section of the Release Notes (see above).</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.2.0 can be found in the upgrade
section of the Release Notes (see above).</p>
</div>
diff --git a/content/index.html b/content/index.html
index 2f95c5a..bb95c0e 100644
--- a/content/index.html
+++ b/content/index.html
@@ -141,11 +141,6 @@
<div class="col-lg-4">
<img src="images/monkey.png" style="width: 210px; margin-left:
115px;" alt="Cloud friendly">
</div>
- <div class="col-lg-3" style="margin-left: 77%;margin-top:
3.5%;">
- <a
href="https://www.apache.org/events/current-event.html";>
- <img
src="https://www.apache.org/events/current-event-234x60.png";>
- </a>
- </div>
</div>
</div>
</div>
@@ -221,13 +216,20 @@ Join Us
</div>
<div class="panel-body">
- <p class="text-warning">Apache CloudStack 4.11.1.0 is out!</p>
+ <p class="text-warning">Apache CloudStack 4.11.2.0 is out!</p>
+ <p>This is current CloudStack LTS release.</p>
- <p>
- Looking for other versions of Apache CloudStack? You can find
our archives on the download page as well.
- </p>
+ <a href="downloads.html"><button type="button" class="btn
btn-success">Download</button></a>
+ <a
href="http://docs.cloudstack.apache.org/en/4.11.2.0/";><button type="button"
class="btn btn-success">Documentation</button></a>
+
+ <p style="margin-top: 20px;">If you prefer proven stability
rather than the newest features, please take a look at the previous LTS
release.</p>
+ <p class="text-warning">Previous Apache CloudStack LTS Release
is 4.9.3.1.</p>
+ <a href="downloads.html"><button type="button" class="btn
btn-success">Download</button></a>
+ <a
href="http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/4.9/";><button
type="button" class="btn btn-success">Documentation</button></a>
- <a href="downloads.html"><button type="button" class="btn
btn-success">Download Now</button></a>
+ <p style="margin-top: 20px;">
+ Looking for other versions of Apache CloudStack? You can find
them in our <a href="archives.html">archieves</a> page as well.
+ </p>
</div>
diff --git a/content/users.html b/content/users.html
index a91f60f..104cf51 100644
--- a/content/users.html
+++ b/content/users.html
@@ -146,13 +146,13 @@
<p>Our users include many major service providers running CloudStack to offer
public cloud services, product vendors who incorporate or integrate with
Cloudstack in their own products, organisations who have used Cloudstack to
build their own private clouds, and systems integrators that offer CloudStack
related services.</p>
-<p><strong>Are you using CloudStack ?</strong></p>
+<h2 id="how-to-add-your-company-in-the-list">How to Add your Company in The
List</h2>
-<p>If you are using CloudStack in your organisation and your company is not
listed here, please complete our brief adoption <a
href="survey.html">survey</a>. We’re happy to keep your company name anonymous
if you require.</p>
+<p>If you are using CloudStack in your organisation and your company is not
listed here, please send a pull request to the GitHub <a
href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown";>page</a>.</p>
-<p><strong>Noticed Something wrong ?</strong></p>
+<h2 id="how-to-request-the-entry-removal-or-change">How to Request the Entry
Removal or Change</h2>
-<p>If you noticed something wrong with your entry here (or if you’d like us
to remove it), please complete our adoption <a href="survey.html">survey</a>.
We will use the information you give us in this survey to update the contents
of this page</p>
+<p>If you noticed something wrong with your entry here (or if you’d like us to
remove it), please send a pull request to the GitHub <a
href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown";>page</a>
or write your concerns to the mail-list
<strong>[email protected]</strong>.</p>
<ul>
<li><a href="http://www.actonmagic.com";>ActOnMagic</a></li>
@@ -182,12 +182,14 @@
<li><a href="http://nectar.org.au";>Melbourne University</a></li>
<li><a href="http://www.miriadis.com";>Miriadis</a></li>
<li><a href="http://neobitti.fi";>Neobitti</a></li>
+ <li><a href="https://netpoint-dc.com/";>NetPoint</a></li>
<li><a href="http://www.openminds.be";>Openminds</a></li>
<li><a href="http://stacksquare.com";>Overweb srl</a></li>
<li><a href="http://polcom.com.pl";>Polcom</a></li>
<li><a href="http://www.reliablenetworks.com";>Reliable Networks</a></li>
<li><a href="http://www.redbridge.se";>Redbridge</a></li>
<li><a href="https://www.safeswisscloud.ch";>SafeSwiss Cloud</a></li>
+ <li><a href="https://www.hiagdata.com";>HIAG Data AG</a></li>
<li><a href="http://www.sjcloud.cn/index.xhtml";>SJC Inc</a></li>
<li><a href="http://www.telia.lv";>Telia Latvia</a></li>
<li><a href="http://www.tqhosting.com";>Tranquil Hosting</a></li>
@@ -211,7 +213,6 @@
<li>Amdocs</li>
<li>Amysta</li>
<li>Angani</li>
- <li>Anolim</li>
<li>Apalia</li>
<li>Appcara Inc.</li>
<li>Appcore</li>
diff --git a/data/cloudstack.yml b/data/cloudstack.yml
index e1a5d03..c337d93 100644
--- a/data/cloudstack.yml
+++ b/data/cloudstack.yml
@@ -1,10 +1,14 @@
versions:
- main: 4.11.1.0
+ main: 4.11.2.0
+ main_islts: LTS
+ main_docs_url: http://docs.cloudstack.apache.org/en/4.11.2.0/
branch: 4.11
lts: 4.9.3.1
+ lts_docs_url:
http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/4.9/
ltsbranch: 4.9
archives:
- '4.11':
+ - 4.11.2.0
- 4.11.1.0
- 4.11.0.0
- '4.10':
diff --git a/source/developers.markdown b/source/developers.markdown
index afa0c21..4e44dd7 100644
--- a/source/developers.markdown
+++ b/source/developers.markdown
@@ -32,9 +32,10 @@ title: Developer Resources for Apache CloudStack
</ul>
</p>
-<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>
+<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:<br />
+<a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md";
target="_blank">GitHub Contribution Guidelines</a></p>
<h3>Submitting a patch through JIRA</h3>
@@ -46,56 +47,123 @@ title: Developer Resources for Apache CloudStack
<p>In short, communication is a vital part of making a contribution to an
Apache project.</p>
-<h3> Getting Started </h3>
+<h3>Getting Started</h3>
+
+<h4>Fork the code</h4>
+
+<p>In your browser, navigate to: <a
href="https://github.com/apache/cloudstack";>https://github.com/apache/cloudstack</a>.</p>
-<p>First, lets make sure that you've added your name and email to your
`~/.gitconfig`:</p>
+<p>Fork the repository by clicking on the 'Fork' button on the top right hand
side. The fork will happen and you will be taken to your own
+fork of the repository. Copy the Git repository URL by clicking on the
clipboard next to the URL on the right hand side of the page under
'<b>HTTPS</b> clone URL'.
+You will paste this URL when doing the following <code>git clone</code>
command.</p>
+
+On your computer, follow these steps to setup a local repository for working
on ACS:
<pre>
-$ git config --global user.name "Your Name"
-$ git config --global user.email [email protected]
+$ git clone https://github.com/YOUR_ACCOUNT/cloudstack.git
+$ cd cloudstack
+$ git remote add upstream https://github.com/apache/cloudstack.git
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
</pre>
-<p>You'll grab the CloudStack source with git:</p>
+<h4>Making Changes</h4>
+
+<p>It is important that you create a new branch to make changes on and that
you do not change the
+<code>master</code> branch (other than to rebase in changes from
<code>upstream/master</code>). In this example I will assume you will be
making your changes
+to a branch called <code>feature_x</code>. This <code>feature_x</code> branch
will be created on your local repository and will be pushed to your
+forked repository on GitHub. Once this branch is on your fork you will create
a Pull Request for the changes to be added to the ACS project.</p>
+
+<p>It is best practice to create a new branch each time you want to contribute
to the project and only track the changes for that pull request in this
branch.</p>
<pre>
-$ git clone https://gitbox.apache.org/repos/asf/cloudstack.git
+$ git checkout -b feature_x
+ (make your changes)
+$ git status
+$ git add .
+$ git commit -a -m "descriptive commit message for your changes"
</pre>
-<p>If you already have the source, make sure you're working with the most
recent version. Do a `git pull` if you cloned the source more than a few hours
ago. (Apache CloudStack development can move pretty fast!)</p>
+<blockquote>The <code>-b</code> specifies that you want to create a new branch
called <code>feature_x</code>. You only specify <code>-b</code> the first time
you
+checkout because you are creating a new branch. Once the
<code>feature_x</code> branch exists, you can later switch to it with only
<code>git checkout feature_x</code>.</blockquote>
+
+<h4>Rebase <code>feature_x</code> to include updates from
<code>upstream/master</code></h4>
+
+<p>It is important that you maintain an up-to-date <code>master</code> branch
in your local repository. This is done by rebasing in the code
+changes from <code>upstream/master</code> (the official ACS project
repository) into your local repository. You will want to do this before you
start
+working on a feature as well as right before you submit your changes as a pull
request. We recommend you do this process periodically while you work to make
+sure you are working off the most recent project code.</p>
+
+<p>This process will do the following:</p>
+
+<ol>
+ <li>Checkout your local <code>master</code> branch;</li>
+ <li>Synchronize your local <code>master</code> branch with the
<code>upstream/master</code> so you have all the latest changes from the
project;</li>
+ <li>Rebase the latest project code into your <code>feature_x</code> branch
so it is up-to-date with the upstream code.</li>
+</ol>
<pre>
-$ git checkout -b mybranch
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
+$ git checkout feature_x
+$ git rebase master
</pre>
-<p>This does two things: One, it creates the branch <em>mybranch</em> and two,
it changes your working branch to <em>mybranch</em>. Running `git branch` will
show you which branch you're working on, with an asterisk next to the active
branch, like so:</p>
+<blockquote>Now your <code>feature_x</code> branch is up-to-date with all the
code in <code>upstream/master</code>.</blockquote>
+
+<h4>Make a GitHub pull request to contribute your changes</h4>
+
+<p>When you are happy with your changes and you are ready to contribute them,
you will create a Pull Request on GitHub to do so.
+This is done by pushing your local changes to your forked repository (default
remote name is <code>origin</code>) and then initiating a pull request on
GitHub.</p>
+
+<p>Please include JIRA ID or GitHub ID, detailed information about the
bug/feature, what all tests are executed, how the reviewer can test this
+feature etc. Incase of UI PRs, a screenshot is preferred.</p>
+
+<blockquote><b>IMPORTANT:</b>Make sure you have rebased your
<code>feature_x</code> branch to include the latest code from
<code>upstream/master</code> <b>before</b>
+you do this.</blockquote>
<pre>
-[user@localhost cloudstack]$ git branch
- master
- * mybranch
- </pre>
+$ git push origin master
+$ git push origin feature_x
+</pre>
-<p>Make whatever changes you're going to make, be sure to use <code>git
add</code> to stage the changes, and then you're going to commit the changes to
your working branch:</p>
+<p>Now that the <code>feature_x</code> branch has been pushed to your GitHub
repository, you can initiate the pull request.</p>
-<pre>git commit -m "Insert a meaningful summary of changes here."</pre>
+<p>To initiate the pull request, do the following:</p>
-<p>Finally, you can create a patch and attach it to the JIRA issue that you
created for the bug you are fixing.</p>
+<ol>
+<li>In your browser, navigate to your forked repository:
<b>https://github.com/YOUR_ACCOUNT/cloudstack</b>;</li>
+<li>Click the new button called '<b>Compare & pull request</b>' that showed up
just above the main area in your forked repository;</li>
+<li>Validate the pull request will be into the upstream <code>master</code>
and will be from your <code>feature_x</code> branch;</li>
+<li>Enter a detailed description of the work you have done and then click
'<b>Send pull request</b>'.</li>
+</ol>
-<pre>git format-patch master --stdout > ~/patch-name.patch</pre>
+<p>If you are requested to make modifications to your proposed changes, make
the changes locally on your <code>feature_x</code> branch, re-push
+the <code>feature_x</code> branch to your fork. The existing pull request
should automatically pick up the change and update accordingly.</p>
-<h3>Review</h3>
+<h4>Cleaning up after a successful pull request</h4>
-<p>Once you've submitted your pull request, you should receive a response
within a few days. If you receive no response within a week, please ping the
cloudstack-dev mailing list ([email protected]).</p>
+<p>Once the <code>feature_x</code> branch has been committed into the
<code>upstream/master</code> branch, your local <code>feature_x</code> branch
+and the <code>origin/feature_x</code> branch are no longer needed. If you want
to make additional changes, restart the process with a new branch.</p>
-<h3>Screencast</h3>
+<blockquote><b>IMPORTANT:</b>Make sure that your changes are in
<code>upstream/master</code>before you delete your <code>feature_x</code>
+and <code>origin/feature_x</code> branches!</blockquote>
-<p>If you are new to git you might want to watch this screencast:</p>
+<p>You can delete these deprecated branches with the following:</p>
-<iframe width="560" height="315"
src="//www.youtube.com/embed/3c5JIW4onGk?list=PLb899uhkHRoZCRE00h_9CRgUSiHEgFDbC"
frameborder="0" allowfullscreen></iframe>
+<pre>
+$ git checkout master
+$ git branch -D feature_x
+$ git push origin :feature_x
+</pre>
<h3>Further Reading</h3>
-<p>You might want to peruse the <a
href="http://www.apache.org/foundation/getinvolved.html"; target="_blank">Get
Involved</a> page on Apache.org, and the <a
href="http://commons.apache.org/patches.html"; target="_blank">On Contributing
Patches</a> doc as well. Note that some of that does not apply to Apache
CloudStack, as we're using git rather than Subversion. But do respect the
original style of the CloudStack code, and ensure that you're using spaces
rather than tabs, and your patches h [...]
+<p>You might want to peruse the <a
href="http://www.apache.org/foundation/getinvolved.html"; target="_blank">Get
Involved</a> page on Apache.org.
+Please, respect the original style of the CloudStack code, and ensure that
you're using spaces rather than tabs, and your code have Unix line
+endings (LF) rather than Windows-type line endings (CRLF).</p>
</div>
@@ -130,7 +198,7 @@ $ git checkout -b mybranch
<div class="panel-heading">
-<h3 class="panel-title">Git Repositories</h3>
+<h3 class="panel-title">CloudStack Git Repositories</h3>
</div>
@@ -141,18 +209,17 @@ $ git checkout -b mybranch
<ul>
<li><a href="https://gitbox.apache.org/repos/asf/cloudstack.git";
target="_blank">Apache CloudStack source code</a></li>
<li><a href="https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git";
target="_blank">Apache CloudStack Cloudmonkey source code</a></li>
-<li><a href="https://github.com/apache/cloudstack-ec2stack";
target="_blank">Apache CloudStack EC2stack Inteface</a></li>
-<li><a href="https://github.com/apache/cloudstack-gcestack";
target="_blank">Apache CloudStack GCEstack Interface</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs";
target="_blank">General Documentation</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-install";
target="_blank">Installation Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-admin";
target="_blank">Administrative Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-rn";
target="_blank">Release Notes</a></li>
+<li><a href="https://github.com/apache/cloudstack-documentation";
target="_blank">Documentation</a></li>
<li><a href="https://github.com/apache/cloudstack-www"; target="_blank">Apache
CloudStack Website</a></li>
</ul>
<p>To get the most recent source for Apache CloudStack, use:</p>
<pre>
+git clone https://github.com/apache/cloudstack.git
+</pre>
+or
+<pre>
git clone https://gitbox.apache.org/repos/asf/cloudstack.git
</pre>
diff --git a/source/index.html.erb b/source/index.html.erb
index 6c83148..f33c842 100644
--- a/source/index.html.erb
+++ b/source/index.html.erb
@@ -15,11 +15,6 @@ title: Welcome to CloudStack
<div class="col-lg-4">
<img src="images/monkey.png" style="width: 210px; margin-left:
115px;" alt="Cloud friendly">
</div>
- <div class="col-lg-3" style="margin-left: 77%;margin-top:
3.5%;">
- <a
href="https://www.apache.org/events/current-event.html";>
- <img
src="https://www.apache.org/events/current-event-234x60.png";>
- </a>
- </div>
</div>
</div>
</div>
@@ -96,13 +91,24 @@ Join Us
<div class="panel-body">
<p class="text-warning">Apache CloudStack <%=
data.cloudstack.versions.main %> is out!</p>
-
- <p>
- Looking for other versions of Apache CloudStack? You can find
our archives on the download page as well.
+ <% if data.cloudstack.versions.main_islts %>
+ <p>This is current CloudStack LTS release.</p>
+ <% else %>
+ <p>This is non-LTS release of CloudStack.</p>
+ <% end %>
+
+ <a href="downloads.html"><button type="button" class="btn
btn-success">Download</button></a>
+ <a href="<%= data.cloudstack.versions.main_docs_url %>"><button
type="button" class="btn btn-success">Documentation</button></a>
+
+ <p style="margin-top: 20px;">If you prefer proven stability
rather than the newest features, please take a look at the previous LTS
release.</p>
+ <p class="text-warning">Previous Apache CloudStack LTS Release
is <%= data.cloudstack.versions.lts %>.</p>
+ <a href="downloads.html"><button type="button" class="btn
btn-success">Download</button></a>
+ <a href="<%= data.cloudstack.versions.lts_docs_url %>"><button
type="button" class="btn btn-success">Documentation</button></a>
+
+ <p style="margin-top: 20px;">
+ Looking for other versions of Apache CloudStack? You can find
them in our <a href="archives.html">archieves</a> page as well.
</p>
- <a href="downloads.html"><button type="button" class="btn
btn-success">Download Now</button></a>
-
</div>
</div>
diff --git a/source/users.markdown b/source/users.markdown
index bb5de01..64a7cd9 100644
--- a/source/users.markdown
+++ b/source/users.markdown
@@ -20,13 +20,13 @@ The following organisations are known users of Apache
CloudStack (or a commercia
Our users include many major service providers running CloudStack to offer
public cloud services, product vendors who incorporate or integrate with
Cloudstack in their own products, organisations who have used Cloudstack to
build their own private clouds, and systems integrators that offer CloudStack
related services.
-**Are you using CloudStack ?**
+## How to Add your Company in The List
-If you are using CloudStack in your organisation and your company is not
listed here, please complete our brief adoption [survey](/survey.html). We’re
happy to keep your company name anonymous if you require.
+If you are using CloudStack in your organisation and your company is not
listed here, please send a pull request to the GitHub
[page](https://github.com/apache/cloudstack-www/blob/master/source/users.markdown).
-**Noticed Something wrong ?**
+## How to Request the Entry Removal or Change
-If you noticed something wrong with your entry here (or if you’d like us to
remove it), please complete our adoption [survey](/survey.html). We will use
the information you give us in this survey to update the contents of this page
+If you noticed something wrong with your entry here (or if you’d like us to
remove it), please send a pull request to the GitHub
[page](https://github.com/apache/cloudstack-www/blob/master/source/users.markdown)
or write your concerns to the mail-list **[email protected]**.
* [ActOnMagic](http://www.actonmagic.com)
* [Appcore](http://www.appcore.com)
@@ -55,12 +55,14 @@ If you noticed something wrong with your entry here (or if
you’d like us to r
* [Melbourne University](http://nectar.org.au)
* [Miriadis](http://www.miriadis.com)
* [Neobitti](http://neobitti.fi)
+* [NetPoint](https://netpoint-dc.com/)
* [Openminds](http://www.openminds.be)
* [Overweb srl](http://stacksquare.com)
* [Polcom](http://polcom.com.pl)
* [Reliable Networks](http://www.reliablenetworks.com)
* [Redbridge](http://www.redbridge.se)
* [SafeSwiss Cloud](https://www.safeswisscloud.ch)
+* [HIAG Data AG](https://www.hiagdata.com)
* [SJC Inc](http://www.sjcloud.cn/index.xhtml)
* [Telia Latvia](http://www.telia.lv)
* [Tranquil Hosting](http://www.tqhosting.com)
@@ -83,7 +85,6 @@ If you noticed something wrong with your entry here (or if
you’d like us to r
* Amdocs
* Amysta
* Angani
-* Anolim
* Apalia
* Appcara Inc.
* Appcore
![https://www.apache.org/events/current-event-234x60.png"](https://www.apache.org/events/current-event-234x60.png"){kind=link}