Merge branch 'master' into asf-site
diff --git a/content/api.html b/content/api.html
index e5e70b0..672d7b2 100644
--- a/content/api.html
+++ b/content/api.html
@@ -128,6 +128,136 @@
</div>
<div class="container">
<div class="bs-docs-section">
+ <!doctype html>
+<html>
+ <head>
+ <title>Apache CloudStack: Open Source Cloud Computing</title>
+
+ <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+
+ <meta itemprop="name" content="Apache Cloudstack">
+ <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+ <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+ <meta property="og:title" content="Apache Cloudstack">
+ <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+ <meta property="og:site_name" content="Apache Cloudstack"/>
+ <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+ <meta name="twitter:card" content="summary">
+ <meta name="twitter:title" content="Apache Cloudstack">
+ <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+ <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+ <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+ <link href="stylesheets/font-awesome.css" rel="stylesheet">
+ <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+ <link href="stylesheets/custom.css" rel="stylesheet">
+
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+ {% if headers.atom %}
+ <link rel="alternate" href="{{ headers.atom.url }}"
+ type="application/atom+xml" title="{{ headers.atom.title }}" />
+ {% endif %}
+
+ {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!-- {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+ <!-- Twitter Bootstrap and jQuery after this line. -->
+ <script src="https://code.jquery.com/jquery-latest.js"></script>
+ <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+ <script>
+ $('.dropdown-toggle').dropdown();
+ $('.nav-collapse').collapse();
+ </script>
+ </head>
+ <body>
+ <div class="navbar navbar-default navbar-fixed-top">
+ <div class="container">
+ <div class="navbar-header">
+ <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+ <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div>
+ <div class="navbar-collapse collapse" id="navbar-main">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+ <ul class="dropdown-menu" aria-labelledby="about">
+ <li><a tabindex="-1" href="about.html">About</a></li>
+ <li class="divider"></li>
+ <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+ <li><a tabindex="-1" href="history.html">History</a></li>
+ <li><a tabindex="-1" href="features.html">Features</a></li>
+ <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+ <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+ <li><a tabindex="-1" href="security.html">Security</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+ <ul class="dropdown-menu" aria-labelledby="community">
+ <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+ <li><a tabindex="-1" href="developers.html">Developers</a></li>
+ <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+ <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events & Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+ <ul class="dropdown-menu" aria-labelledby="users">
+ <li><a tabindex="-1" href="users.html">Known Users</a></li>
+ <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+ <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+ <ul class="dropdown-menu" aria-labelledby="docs">
+ <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+ <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+ <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+ <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+ <li class="divider"></li>
+ <li><a tabindex="-1">Archived Documentation</a></li>
+ <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank"> Getting Started Docs</span></a></li>
+ <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank"> Installation Docs</a></li>
+ <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank"> Administration Docs</a></li>
+ <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank"> Release Notes</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+ <ul class="dropdown-menu" aria-labelledby="download">
+ <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+ <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+ <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+ <ul class="dropdown-menu" aria-labelledby="apache">
+ <li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+ <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+ <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="bs-docs-section">
<div class="row">
<div class="col-lg-12">
@@ -148,6 +278,11 @@
we would welcome your help, please file a bug in the
<a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
or by submitting a patch.</p>
+<h2 id="x">4.12.0.0</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.12/index.html">All API</a></li>
+</ul>
<h2 id="x">4.11.x</h2>
@@ -197,3 +332,16 @@
</div>
</body>
</html>
+
+
+ <footer>
+ <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+ <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+ </footer>
+
+ </div>
+ </div>
+</div>
+ </body>
+</html>
diff --git a/content/api/api20190402-18624-1jnt8jy b/content/api/api20190402-18624-1jnt8jy
new file mode 100644
index 0000000..b7a3de8
--- /dev/null
+++ b/content/api/api20190402-18624-1jnt8jy
@@ -0,0 +1,56 @@
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack: API Documentation</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>Below are API reference material for Apache CloudStack, provided by major feature version. Each feature version supports three levels of access, and the available API commands for each level are provided seperately.</p>
+
+<p>If you find problems or see ways in which this API reference can be enhanced
+we would welcome your help, please file a bug in the
+<a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
+or by submitting a patch.</p>
+
+<h2 id="x">4.11.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.11/index.html">All API</a></li>
+</ul>
+
+<h2 id="x-1">4.10.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.10/">All API</a></li>
+</ul>
+
+<h2 id="x-2">4.9.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.9/">All API</a></li>
+</ul>
+
+<h2 id="x-3">4.8.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.8/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_User.html">User API</a></li>
+</ul>
+
+<h2 id="x-4">4.7.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.7/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_User.html">User API</a></li>
+</ul>
+
+<p>Older API documentation is now located in the <a href="api_archives.html">API archives page</a>.</p>
diff --git a/content/api/api20190402-18815-xkuo74 b/content/api/api20190402-18815-xkuo74
new file mode 100644
index 0000000..b7a3de8
--- /dev/null
+++ b/content/api/api20190402-18815-xkuo74
@@ -0,0 +1,56 @@
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack: API Documentation</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>Below are API reference material for Apache CloudStack, provided by major feature version. Each feature version supports three levels of access, and the available API commands for each level are provided seperately.</p>
+
+<p>If you find problems or see ways in which this API reference can be enhanced
+we would welcome your help, please file a bug in the
+<a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
+or by submitting a patch.</p>
+
+<h2 id="x">4.11.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.11/index.html">All API</a></li>
+</ul>
+
+<h2 id="x-1">4.10.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.10/">All API</a></li>
+</ul>
+
+<h2 id="x-2">4.9.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.9/">All API</a></li>
+</ul>
+
+<h2 id="x-3">4.8.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.8/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_User.html">User API</a></li>
+</ul>
+
+<h2 id="x-4">4.7.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.7/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_User.html">User API</a></li>
+</ul>
+
+<p>Older API documentation is now located in the <a href="api_archives.html">API archives page</a>.</p>
diff --git a/content/api/api20190402-19294-580c9j b/content/api/api20190402-19294-580c9j
new file mode 100644
index 0000000..b7a3de8
--- /dev/null
+++ b/content/api/api20190402-19294-580c9j
@@ -0,0 +1,56 @@
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack: API Documentation</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>Below are API reference material for Apache CloudStack, provided by major feature version. Each feature version supports three levels of access, and the available API commands for each level are provided seperately.</p>
+
+<p>If you find problems or see ways in which this API reference can be enhanced
+we would welcome your help, please file a bug in the
+<a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
+or by submitting a patch.</p>
+
+<h2 id="x">4.11.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.11/index.html">All API</a></li>
+</ul>
+
+<h2 id="x-1">4.10.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.10/">All API</a></li>
+</ul>
+
+<h2 id="x-2">4.9.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.9/">All API</a></li>
+</ul>
+
+<h2 id="x-3">4.8.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.8/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_User.html">User API</a></li>
+</ul>
+
+<h2 id="x-4">4.7.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.7/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_User.html">User API</a></li>
+</ul>
+
+<p>Older API documentation is now located in the <a href="api_archives.html">API archives page</a>.</p>
diff --git a/content/api/api20190402-19530-1ti1usf b/content/api/api20190402-19530-1ti1usf
new file mode 100644
index 0000000..b7a3de8
--- /dev/null
+++ b/content/api/api20190402-19530-1ti1usf
@@ -0,0 +1,56 @@
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack: API Documentation</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>Below are API reference material for Apache CloudStack, provided by major feature version. Each feature version supports three levels of access, and the available API commands for each level are provided seperately.</p>
+
+<p>If you find problems or see ways in which this API reference can be enhanced
+we would welcome your help, please file a bug in the
+<a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
+or by submitting a patch.</p>
+
+<h2 id="x">4.11.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.11/index.html">All API</a></li>
+</ul>
+
+<h2 id="x-1">4.10.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.10/">All API</a></li>
+</ul>
+
+<h2 id="x-2">4.9.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.9/">All API</a></li>
+</ul>
+
+<h2 id="x-3">4.8.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.8/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_User.html">User API</a></li>
+</ul>
+
+<h2 id="x-4">4.7.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.7/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_User.html">User API</a></li>
+</ul>
+
+<p>Older API documentation is now located in the <a href="api_archives.html">API archives page</a>.</p>
diff --git a/content/api/api20190402-21462-1asmwkl b/content/api/api20190402-21462-1asmwkl
new file mode 100644
index 0000000..b7a3de8
--- /dev/null
+++ b/content/api/api20190402-21462-1asmwkl
@@ -0,0 +1,56 @@
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack: API Documentation</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>Below are API reference material for Apache CloudStack, provided by major feature version. Each feature version supports three levels of access, and the available API commands for each level are provided seperately.</p>
+
+<p>If you find problems or see ways in which this API reference can be enhanced
+we would welcome your help, please file a bug in the
+<a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
+or by submitting a patch.</p>
+
+<h2 id="x">4.11.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.11/index.html">All API</a></li>
+</ul>
+
+<h2 id="x-1">4.10.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.10/">All API</a></li>
+</ul>
+
+<h2 id="x-2">4.9.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.9/">All API</a></li>
+</ul>
+
+<h2 id="x-3">4.8.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.8/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_User.html">User API</a></li>
+</ul>
+
+<h2 id="x-4">4.7.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.7/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_User.html">User API</a></li>
+</ul>
+
+<p>Older API documentation is now located in the <a href="api_archives.html">API archives page</a>.</p>
diff --git a/content/api/api20190402-22354-5xunz6 b/content/api/api20190402-22354-5xunz6
new file mode 100644
index 0000000..b7a3de8
--- /dev/null
+++ b/content/api/api20190402-22354-5xunz6
@@ -0,0 +1,56 @@
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack: API Documentation</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>Below are API reference material for Apache CloudStack, provided by major feature version. Each feature version supports three levels of access, and the available API commands for each level are provided seperately.</p>
+
+<p>If you find problems or see ways in which this API reference can be enhanced
+we would welcome your help, please file a bug in the
+<a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
+or by submitting a patch.</p>
+
+<h2 id="x">4.11.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.11/index.html">All API</a></li>
+</ul>
+
+<h2 id="x-1">4.10.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.10/">All API</a></li>
+</ul>
+
+<h2 id="x-2">4.9.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.9/">All API</a></li>
+</ul>
+
+<h2 id="x-3">4.8.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.8/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.8/TOC_User.html">User API</a></li>
+</ul>
+
+<h2 id="x-4">4.7.x</h2>
+
+<ul>
+ <li><a href="api/apidocs-4.7/TOC_Root_Admin.html">Root Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_Domain_Admin.html">Domain Admin API</a></li>
+ <li><a href="api/apidocs-4.7/TOC_User.html">User API</a></li>
+</ul>
+
+<p>Older API documentation is now located in the <a href="api_archives.html">API archives page</a>.</p>
diff --git a/content/archives.html b/content/archives.html
index cfd9260..d9c9fbc 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -226,7 +226,10 @@
<ul>
<li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/">apache-cloudstack-cloudmonkey-6.0.0</a></li>
+<<<<<<< HEAD
+=======
<li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/">apache-cloudstack-cloudmonkey-5.3.3</a></li>
+>>>>>>> master
<li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.2/">apache-cloudstack-cloudmonkey-5.3.2</a></li>
<li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/">apache-cloudstack-cloudmonkey-5.3.1</a></li>
<li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/">apache-cloudstack-cloudmonkey-5.3.0</a></li>
diff --git a/content/developers b/content/developers
index 4d4db33..827fa8a 100644
--- a/content/developers
+++ b/content/developers
@@ -86,9 +86,15 @@
<h4>Rebase <code>feature_x</code> to include updates from <code>upstream/master</code></h4>
+<<<<<<< HEAD
+<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
+=======
<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
+>>>>>>> master
sure you are working off the most recent project code.</p>
<p>This process will do the following:</p>
diff --git a/content/downloads.html b/content/downloads.html
index 3162ef2..e1cd824 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -445,6 +445,11 @@
</p>
+<<<<<<< HEAD
+<p>Instructions for building and installing from source can be found in the included <a href="https://gitbox.apache.org/repos/asf?p=cloudstack-cloudmonkey.git;a=blob_plain;f=README.md">README.md</a> file.</p>
+
+=======
+>>>>>>> master
<h4 id="github-release">Binary Builds Release</h4>
<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the <a href="https://github.com/apache/cloudstack-cloudmonkey/releases">Apache CloudStack CloudMonkey Github release</a> page.</p>
@@ -471,6 +476,7 @@
</html>
+
<footer>
<p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
"Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
diff --git a/content/who b/content/who
index c010ab5..b7ec893 100644
--- a/content/who
+++ b/content/who
@@ -16,6 +16,196 @@
<h2 id="pmc">PMC</h2>
+<<<<<<< HEAD
+<p>Active Project Management Committee contains (in alphabetical order of their usernames):</p>
+
+<table class="table-bordered">
+ <thead>
+ <tr>
+ <th>Username</th>
+ <th>Name</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>ahuang</td>
+ <td>Alex Huang</td>
+ </tr>
+ <tr>
+ <td>akarasulu</td>
+ <td>Alex Karasulu</td>
+ </tr>
+ <tr>
+ <td>alena1108</td>
+ <td>Alena Prokharchyk</td>
+ </tr>
+ <tr>
+ <td>animesh</td>
+ <td>Animesh</td>
+ </tr>
+ <tr>
+ <td>boris</td>
+ <td>Boris Schrijver</td>
+ </tr>
+ <tr>
+ <td>chipchilders</td>
+ <td>Chip Childers</td>
+ </tr>
+ <tr>
+ <td>chiradeep</td>
+ <td>Chiradeep Vittal</td>
+ </tr>
+ <tr>
+ <td>dahn</td>
+ <td>Daan</td>
+ </tr>
+ <tr>
+ <td>duffy</td>
+ <td>Ian Duffy</td>
+ </tr>
+ <tr>
+ <td>edison</td>
+ <td>Disheng Su</td>
+ </tr>
+ <tr>
+ <td>ekho</td>
+ <td>Wilder Rodrigues</td>
+ </tr>
+ <tr>
+ <td>erikw</td>
+ <td>Erik Weber</td>
+ </tr>
+ <tr>
+ <td>giles</td>
+ <td>Giles Sirett</td>
+ </tr>
+ <tr>
+ <td>gochiba</td>
+ <td>Go Chiba</td>
+ </tr>
+ <tr>
+ <td>hogstrom</td>
+ <td>Matt Richard Hogstrom</td>
+ </tr>
+ <tr>
+ <td>hugo</td>
+ <td>Hugo Trippaers</td>
+ </tr>
+ <tr>
+ <td>ilya</td>
+ <td>Ilya Musayev</td>
+ </tr>
+ <tr>
+ <td>jburwell</td>
+ <td>John Burwell</td>
+ </tr>
+ <tr>
+ <td>jim</td>
+ <td>Jim Jagielski</td>
+ </tr>
+ <tr>
+ <td>jlk</td>
+ <td>John Kinsella</td>
+ </tr>
+ <tr>
+ <td>jzb</td>
+ <td>Joe Brockmeier</td>
+ </tr>
+ <tr>
+ <td>karenv</td>
+ <td>Karen Vuong</td>
+ </tr>
+ <tr>
+ <td>ke4qqq</td>
+ <td>David Nalley</td>
+ </tr>
+ <tr>
+ <td>kluge</td>
+ <td>Kevin Kluge</td>
+ </tr>
+ <tr>
+ <td>milamber</td>
+ <td>Bruno Demion</td>
+ </tr>
+ <tr>
+ <td>mlsorensen</td>
+ <td>Marcus Sorensen</td>
+ </tr>
+ <tr>
+ <td>mnour</td>
+ <td>Mohammad Nour El-Din</td>
+ </tr>
+ <tr>
+ <td>mrhinkle</td>
+ <td>Mark R. Hinkle</td>
+ </tr>
+ <tr>
+ <td>mtutkowski</td>
+ <td>Mike Tutkowski</td>
+ </tr>
+ <tr>
+ <td>nslater</td>
+ <td>Naomi Slater</td>
+ </tr>
+ <tr>
+ <td>nux</td>
+ <td>Nux</td>
+ </tr>
+ <tr>
+ <td>olamy</td>
+ <td>Olivier Lamy</td>
+ </tr>
+ <tr>
+ <td>paul_a</td>
+ <td>Paul Angus</td>
+ </tr>
+ <tr>
+ <td>pdion891</td>
+ <td>Pierre-Luc Dion</td>
+ </tr>
+ <tr>
+ <td>rafael</td>
+ <td>Rafael Weingärtner</td>
+ </tr>
+ <tr>
+ <td>rajani</td>
+ <td>Rajani Karuturi</td>
+ </tr>
+ <tr>
+ <td>remi</td>
+ <td>Remi Bergsma</td>
+ </tr>
+ <tr>
+ <td>rohit</td>
+ <td>Rohit Yadav</td>
+ </tr>
+ <tr>
+ <td>sebgoa</td>
+ <td>Sebastien Goasguen</td>
+ </tr>
+ <tr>
+ <td>sweller</td>
+ <td>Simon Weller</td>
+ </tr>
+ <tr>
+ <td>swill</td>
+ <td>Will Stevens</td>
+ </tr>
+ <tr>
+ <td>tsp</td>
+ <td>Prasanna</td>
+ </tr>
+ <tr>
+ <td>widodh</td>
+ <td>Wido den Hollander</td>
+ </tr>
+ <tr>
+ <td>willchan</td>
+ <td>William Chan</td>
+ </tr>
+ </tbody>
+</table>
+=======
<p class="table-bordered">Active Project Management Committee contains (in alphabetical order of their usernames):</p>
<p>| Username | Name |
|———-|——|
@@ -61,6 +251,7 @@
|weizhou|Wei Zhou|
|widodh|Wido den Hollander|
|willchan|William Chan|</p>
+>>>>>>> master
<h2 id="emeritus-pmc-members">Emeritus PMC Members</h2>
<p>PMC members who are no longer active include:</p>
@@ -76,6 +267,466 @@
<p>Active list of committers (in alphabetical order of their usernames)</p>
+<<<<<<< HEAD
+<table class="table-bordered">
+ <thead>
+ <tr>
+ <th>Username</th>
+ <th>Name</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>ahmad</td>
+ <td>Ahmad Emneina</td>
+ </tr>
+ <tr>
+ <td>ahuang</td>
+ <td>Alex Huang</td>
+ </tr>
+ <tr>
+ <td>akarasulu</td>
+ <td>Alex Karasulu</td>
+ </tr>
+ <tr>
+ <td>alena1108</td>
+ <td>Alena Prokharchyk</td>
+ </tr>
+ <tr>
+ <td>amoghvk</td>
+ <td>Amogh Vasekar</td>
+ </tr>
+ <tr>
+ <td>animesh</td>
+ <td>Animesh</td>
+ </tr>
+ <tr>
+ <td>anthonyxu</td>
+ <td>Anthony Xu</td>
+ </tr>
+ <tr>
+ <td>aprateek</td>
+ <td>Abhinandan Prateek</td>
+ </tr>
+ <tr>
+ <td>bfederle</td>
+ <td>Brian Federle</td>
+ </tr>
+ <tr>
+ <td>boris</td>
+ <td>Boris Schrijver</td>
+ </tr>
+ <tr>
+ <td>brett</td>
+ <td>Brett Porter</td>
+ </tr>
+ <tr>
+ <td>chipchilders</td>
+ <td>Chip Childers</td>
+ </tr>
+ <tr>
+ <td>chiradeep</td>
+ <td>Chiradeep Vittal</td>
+ </tr>
+ <tr>
+ <td>claytonweise</td>
+ <td>Clayton Weise</td>
+ </tr>
+ <tr>
+ <td>csuich2</td>
+ <td>Chris Suich</td>
+ </tr>
+ <tr>
+ <td>dahn</td>
+ <td>Daan</td>
+ </tr>
+ <tr>
+ <td>darren</td>
+ <td>Darren Shepherd</td>
+ </tr>
+ <tr>
+ <td>dcahill</td>
+ <td>Dave Cahill</td>
+ </tr>
+ <tr>
+ <td>demetriust</td>
+ <td>Demetrius Tsitrelis</td>
+ </tr>
+ <tr>
+ <td>devdeep</td>
+ <td>Devdeep Singh</td>
+ </tr>
+ <tr>
+ <td>duffy</td>
+ <td>Ian Duffy</td>
+ </tr>
+ <tr>
+ <td>edison</td>
+ <td>Disheng Su</td>
+ </tr>
+ <tr>
+ <td>ekho</td>
+ <td>Wilder Rodrigues</td>
+ </tr>
+ <tr>
+ <td>erikw</td>
+ <td>Erik Weber</td>
+ </tr>
+ <tr>
+ <td>frankzhang</td>
+ <td>Xin Zhang</td>
+ </tr>
+ <tr>
+ <td>gaurav</td>
+ <td>Gaurav Nandkumar Aradhye</td>
+ </tr>
+ <tr>
+ <td>gavinlee</td>
+ <td>Gavin Lee</td>
+ </tr>
+ <tr>
+ <td>giles</td>
+ <td>Giles Sirett</td>
+ </tr>
+ <tr>
+ <td>girish</td>
+ <td>Girish Prabhakar Shilamkar</td>
+ </tr>
+ <tr>
+ <td>gochiba</td>
+ <td>Go Chiba</td>
+ </tr>
+ <tr>
+ <td>haeena</td>
+ <td>Toshiaki Hatano</td>
+ </tr>
+ <tr>
+ <td>harikrishna</td>
+ <td>Harikrishna Patnala</td>
+ </tr>
+ <tr>
+ <td>higster</td>
+ <td>Geoff Higginbottom</td>
+ </tr>
+ <tr>
+ <td>hogstrom</td>
+ <td>Matt Richard Hogstrom</td>
+ </tr>
+ <tr>
+ <td>hugo</td>
+ <td>Hugo Trippaers</td>
+ </tr>
+ <tr>
+ <td>ilya</td>
+ <td>Ilya Musayev</td>
+ </tr>
+ <tr>
+ <td>isaacchiang</td>
+ <td>Isaac Chiang</td>
+ </tr>
+ <tr>
+ <td>jayapal</td>
+ <td>Jayapal</td>
+ </tr>
+ <tr>
+ <td>jbausewein</td>
+ <td>Jason Bausewein</td>
+ </tr>
+ <tr>
+ <td>jburwell</td>
+ <td>John Burwell</td>
+ </tr>
+ <tr>
+ <td>jessicawang</td>
+ <td>Jessica Wang</td>
+ </tr>
+ <tr>
+ <td>jim</td>
+ <td>Jim Jagielski</td>
+ </tr>
+ <tr>
+ <td>jlk</td>
+ <td>John Kinsella</td>
+ </tr>
+ <tr>
+ <td>jtomechak</td>
+ <td>Jessica Tomechak</td>
+ </tr>
+ <tr>
+ <td>jzb</td>
+ <td>Joe Brockmeier</td>
+ </tr>
+ <tr>
+ <td>karenv</td>
+ <td>Karen Vuong</td>
+ </tr>
+ <tr>
+ <td>kawai</td>
+ <td>Hiroaki Kawai</td>
+ </tr>
+ <tr>
+ <td>kdamage</td>
+ <td>Kelcey Damage</td>
+ </tr>
+ <tr>
+ <td>ke4qqq</td>
+ <td>David Nalley</td>
+ </tr>
+ <tr>
+ <td>kelveny</td>
+ <td>Kelven Yang</td>
+ </tr>
+ <tr>
+ <td>kirk</td>
+ <td>Kirk Kosinski</td>
+ </tr>
+ <tr>
+ <td>kishan</td>
+ <td>Kishan</td>
+ </tr>
+ <tr>
+ <td>kluge</td>
+ <td>Kevin Kluge</td>
+ </tr>
+ <tr>
+ <td>kocka</td>
+ <td>Laszlo Hornyak</td>
+ </tr>
+ <tr>
+ <td>koushik</td>
+ <td>Koushik Das</td>
+ </tr>
+ <tr>
+ <td>likithas</td>
+ <td>Likitha Shetty</td>
+ </tr>
+ <tr>
+ <td>mchen</td>
+ <td>Min Chen</td>
+ </tr>
+ <tr>
+ <td>mice</td>
+ <td>Mice Xia</td>
+ </tr>
+ <tr>
+ <td>milamber</td>
+ <td>Bruno Demion</td>
+ </tr>
+ <tr>
+ <td>mlsorensen</td>
+ <td>Marcus Sorensen</td>
+ </tr>
+ <tr>
+ <td>mnour</td>
+ <td>Mohammad Nour El-Din</td>
+ </tr>
+ <tr>
+ <td>mrhinkle</td>
+ <td>Mark R. Hinkle</td>
+ </tr>
+ <tr>
+ <td>msinhore</td>
+ <td>Marco Sinhoreli</td>
+ </tr>
+ <tr>
+ <td>mtutkowski</td>
+ <td>Mike Tutkowski</td>
+ </tr>
+ <tr>
+ <td>muralireddy</td>
+ <td>Murali Mohan Reddy</td>
+ </tr>
+ <tr>
+ <td>nitin</td>
+ <td>Nitin</td>
+ </tr>
+ <tr>
+ <td>noa</td>
+ <td>Noa Resare</td>
+ </tr>
+ <tr>
+ <td>nslater</td>
+ <td>Naomi Slater</td>
+ </tr>
+ <tr>
+ <td>nux</td>
+ <td>Nux</td>
+ </tr>
+ <tr>
+ <td>nvazquez</td>
+ <td>Nicolás Vázquez</td>
+ </tr>
+ <tr>
+ <td>olamy</td>
+ <td>Olivier Lamy</td>
+ </tr>
+ <tr>
+ <td>olgasmola</td>
+ <td>Olga Smola</td>
+ </tr>
+ <tr>
+ <td>paul_a</td>
+ <td>Paul Angus</td>
+ </tr>
+ <tr>
+ <td>pdion891</td>
+ <td>Pierre-Luc Dion</td>
+ </tr>
+ <tr>
+ <td>pnguyen</td>
+ <td>Phong Nguyen</td>
+ </tr>
+ <tr>
+ <td>prachidamle</td>
+ <td>Prachi Damle</td>
+ </tr>
+ <tr>
+ <td>pranavs</td>
+ <td>Pranav Saxena</td>
+ </tr>
+ <tr>
+ <td>pyr</td>
+ <td>Pierre-Yves Ritschard</td>
+ </tr>
+ <tr>
+ <td>radhika</td>
+ <td>Radhika Nair</td>
+ </tr>
+ <tr>
+ <td>rafael</td>
+ <td>Rafael Weingärtner</td>
+ </tr>
+ <tr>
+ <td>rajani</td>
+ <td>Rajani Karuturi</td>
+ </tr>
+ <tr>
+ <td>rajeshbattala</td>
+ <td>Rajesh Battala</td>
+ </tr>
+ <tr>
+ <td>remi</td>
+ <td>Remi Bergsma</td>
+ </tr>
+ <tr>
+ <td>resmo</td>
+ <td>Rene Moser</td>
+ </tr>
+ <tr>
+ <td>rohit</td>
+ <td>Rohit Yadav</td>
+ </tr>
+ <tr>
+ <td>sailajamada</td>
+ <td>Sailaja Mada</td>
+ </tr>
+ <tr>
+ <td>saksham</td>
+ <td>Saksham Srivastava</td>
+ </tr>
+ <tr>
+ <td>sangeethah</td>
+ <td>Sangeetha Hariharan</td>
+ </tr>
+ <tr>
+ <td>sanjaytripathi</td>
+ <td>Sanjay Tripathi</td>
+ </tr>
+ <tr>
+ <td>sanjeev</td>
+ <td>Sanjeev Neelarapu</td>
+ </tr>
+ <tr>
+ <td>santhoshedukulla</td>
+ <td>Santhosh</td>
+ </tr>
+ <tr>
+ <td>sateesh</td>
+ <td>Sateesh Chodapuneedi</td>
+ </tr>
+ <tr>
+ <td>schhen</td>
+ <td>Sonny Heng Chhen</td>
+ </tr>
+ <tr>
+ <td>sebgoa</td>
+ <td>Sebastien Goasguen</td>
+ </tr>
+ <tr>
+ <td>serg38</td>
+ <td>Sergey Levitskiy</td>
+ </tr>
+ <tr>
+ <td>slriv</td>
+ <td>Sam Robertson</td>
+ </tr>
+ <tr>
+ <td>snuf</td>
+ <td>Funs Kessen</td>
+ </tr>
+ <tr>
+ <td>sowmya</td>
+ <td>Sowmya Krishnan</td>
+ </tr>
+ <tr>
+ <td>sudhap</td>
+ <td>Sudhap</td>
+ </tr>
+ <tr>
+ <td>swamy</td>
+ <td>Venkata Swamy</td>
+ </tr>
+ <tr>
+ <td>sweller</td>
+ <td>Simon Weller</td>
+ </tr>
+ <tr>
+ <td>swill</td>
+ <td>Will Stevens</td>
+ </tr>
+ <tr>
+ <td>syed</td>
+ <td>Syed Ahmed</td>
+ </tr>
+ <tr>
+ <td>talluri</td>
+ <td>Srikanteswararao Talluri</td>
+ </tr>
+ <tr>
+ <td>tsp</td>
+ <td>Prasanna</td>
+ </tr>
+ <tr>
+ <td>tuna</td>
+ <td>Anh Tu Nguyen</td>
+ </tr>
+ <tr>
+ <td>vijayendrabvs</td>
+ <td>Vijayendra Bhamidipati</td>
+ </tr>
+ <tr>
+ <td>weizhou</td>
+ <td>Wei Zhou</td>
+ </tr>
+ <tr>
+ <td>widodh</td>
+ <td>Wido den Hollander</td>
+ </tr>
+ <tr>
+ <td>willchan</td>
+ <td>William Chan</td>
+ </tr>
+ <tr>
+ <td>yasker</td>
+ <td>Sheng Yang</td>
+ </tr>
+ <tr>
+ <td>ynojima</td>
+ <td>Yoshikazu Nojima</td>
+ </tr>
+ </tbody>
+</table>
+=======
<p class="table-bordered">Active list of committers (in alphabetical order of their usernames):</p>
<p>| Username | Name |
|———-|——|
@@ -196,6 +847,7 @@
|willchan|William Chan|
|yasker|Sheng Yang|
|ynojima|Yoshikazu Nojima|</p>
+>>>>>>> master
<h2 id="emeritus-committers">Emeritus Committers</h2>
<p>Committers who are no longer active include:</p>
