Merge branch 'master' into asf-site
diff --git a/build.sh b/build.sh
index 96ebdda..6610177 100755
--- a/build.sh
+++ b/build.sh
@@ -16,6 +16,6 @@
# specific language governing permissions and limitations
# under the License.
-middleman build
+bundle exec middleman build
cp -r ./build/* ./content
git add ./content/\*
diff --git a/content/api/api20190410-8282-tgtmmg b/content/api/api20190410-8282-tgtmmg
new file mode 100644
index 0000000..b7a3de8
--- /dev/null
+++ b/content/api/api20190410-8282-tgtmmg
@@ -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 e583d14..d9c9fbc 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -131,6 +131,11 @@
<h2 id="indicators">Archived Releases</h2>
<ul>
+ <li>4.12
+ <ul>
+ <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2">apache-cloudstack-4.12.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2.sha">SHA512</a> ]</li>
+ </ul>
+ </li>
<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-cloudstack-4.11.2.0-src.tar.bz2.sha">SHA512</a> ]</li>
@@ -221,6 +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 2bcf481..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 a649292..e1cd824 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -445,8 +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>
@@ -464,7 +467,13 @@
<h2 id="indicators">Archived Releases</h2>
You can find links to all the releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
-</div></div></div>
+</div></div>
+</div>
+ </div>
+ </div>
+</div>
+ </body>
+</html>
diff --git a/content/index.html b/content/index.html
index 438bf35..874cb36 100644
--- a/content/index.html
+++ b/content/index.html
@@ -257,31 +257,40 @@
<ul type="disc">
<li>
<a
- href="https://www.meetup.com/german-CloudStack-user-group/"
+ href="https://www.meetup.com/de-DE/german-CloudStack-user-group/events/259269366/"
target="_blank"
>
- CloudStack European User Group
+ April CloudStack Meetup (Germany)
</a>
- , Frankfurt, 28<sup>th</sup> February
+ , Sankt Augustin (Bonn), 11<sup>th</sup> April
</li>
<li>
<a
- href="https://www.eventbrite.co.uk/e/cloudstack-european-user-group-ceph-day-tickets-42670526694"
+ href="http://br.cloudstackcollab.org/"
+ target="_blank"
>
- Cloudstack and Ceph day
+ CloudStack Collaboration Conference Brazil
</a>
- , London, 19<sup>th</sup> April
+ , Florianopolis, 26<sup>th</sup> April
</li>
<li>
- <a href="https://apachecon.com/">Apache EU Roadshow,</a>
- Berlin, 13-14 June
- </li>
- <li>
- <a href="http://cloudstackcollab.org/">
- CloudStack Collaboration Conference
+ <a
+ href="https://www.eventbrite.co.uk/e/cloudstack-european-user-group-meetup-tickets-55911193886"
+ target="_blank"
+ >
+ CloudStack European User Group meetup
</a>
- , Montreal, 24<sup>th</sup>-29<sup>th</sup> September
- </li>
+ , Sofia, 13<sup>th</sup> June
+ </li>
+ <li>
+ <a
+ href="http://us.cloudstackcollab.org/"
+ target="_blank"
+ >
+ CloudStack Collaboration Conference North America
+ </a>
+ , Las Vegas, 9<sup>th</sup> - 11<sup>th</sup> September
+ </li>
</ul>
<p>
View videos from previous CloudStack Collaboration Conferences:
@@ -289,6 +298,13 @@
<ul type="disc">
<li>
<a
+ href="https://www.youtube.com/playlist?list=PLU2OcwpQkYCwcPxZMKX2BFoKE0Z7g1ENH"
+ target="_blank">
+ CloudStack Collaboration Conference June 2018 in Montreal
+ </a>
+ </li>
+ <li>
+ <a
href="https://www.youtube.com/playlist?list=PLCfLScXpEyAS4YkJpeqDriP7JcU82Tx2r"
target="_blank">
CloudStack Collaboration Conference June 2016 in Montreal
diff --git a/content/stylesheets/all.css b/content/stylesheets/all.css
index 7096bcc..bdfde18 100644
--- a/content/stylesheets/all.css
+++ b/content/stylesheets/all.css
@@ -1,174 +1,55 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-/*
-* Based on CSS from the Apache Wookie Project's Web site.
-*/
-
+@charset "utf-8";
body {
- background-color: #FCFDFD;
- font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
- font-size: 11pt;
- margin: 0;
-}
+ background: #d4d4d4 url("../images/background.png");
+ text-align: center;
+ font-family: sans-serif; }
-a {
- color: #339;
- text-decoration: none;
-}
+h1 {
+ color: rgba(0, 0, 0, .3);
+ font-weight: bold;
+ font-size: 32px;
+ letter-spacing: -1px;
+ text-transform: uppercase;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
+ background: url("../images/middleman.png") no-repeat center 100px;
+ padding: 350px 0 10px;
+ margin: 0; }
-a:visited {
- color: #369;
-}
+.doc {
+ font-size: 14px;
+ margin: 0; }
+ .doc:before,
+ .doc:after {
+ opacity: .2;
+ padding: 6px;
+ font-style: normal;
+ position: relative;
+ content: "•"; }
+ .doc a {
+ color: rgba(0, 0, 0, 0.3); }
+ .doc a:hover {
+ color: #666; }
-a:hover {
- color: #ddf;
- background-color: #6badff;
-}
+.welcome {
+ -webkit-animation-name: welcome;
+ -webkit-animation-duration: .9s; }
-p {
- line-height: 140%
-}
-
-code,pre {
- padding: 2px 2px;
- color: #00003D;
- background-color: #F1FFFF;
- border: 1px solid #E1E1E8;
- line-height: 140%
-}
-
-h1,h2,h3,h4,h5,h6 {
- color: #8a8a8a;
-}
-
-#content {
- margin-top: 15px;
- margin-left: 235px;
- margin-right: 150px;
- padding: 0 8px 40px;
- color: black;
- background: #FCFDFD;
-}
-
-#content h1,h2,h3,h4,h5,h6 {
- color: #8a8a8a;
- border-bottom: 1px solid #000000;
- font-weight: normal;
- margin: 10px 0 15px;
- padding: 5px 0;
-}
-
-#content h1 {
- font-size: 18pt;
- border: 1px solid #69afd8;
- -moz-border-radius: 10px;
- border-radius: 10px;
- padding: 15px;
-}
-
-#content h2 {
- font-size: 16pt;
-}
-
-#content h3,h4,h5,h6 {
- border-bottom: none;
- color: #69afd8;
- font-size: 14pt;
- margin-bottom: 0;
-}
-
-#navigation {
- border: 1px solid #69afd8;
- -moz-border-radius: 10px;
- border-radius: 10px;
- font-size: 85%;
- color: #003;
- float: left;
- padding: 8px;
- width: 200px;
- background: #FCFDFD;
- margin-left: 10px;
- margin-right: 10px;
-}
-
-#navigation img {
- padding-bottom: 15px;
- padding-top: 15px;
- padding-right: 10px;
- padding-left: 10px;
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
-
-#navigation h1 {
- color: #000;
- font-size: 1.1em;
- padding: 0;
- margin-top: 0.8em;
- margin-bottom: 0.5em;
- border-bottom: 1px dotted #3487ef;
-}
-
-#navigation ul {
- margin: 0 0;
- padding: 0;
- list-style: none;
-}
-
-#navigation li {
- margin: 0;
- padding: 0;
-}
-
-#navigation li a {
- margin: 0;
- color: #003;
- text-decoration:none;
-}
-
-#navigation li a:visited {
- color: #226;
-}
-
-#navigation li a:hover {
- background-color: #6badff;
- color: #000;
-}
-
-#footer {
- margin-top: 15px;
- margin-left: 235px;
- margin-right: 150px;
- border: 1px solid #000000;
- -moz-border-radius: 10px;
- border-radius: 10px;
- background-color:#c6dcf3;
- color:#336;
- font-size: 80%;
- padding: 0 8px;
-}
-
-/* definition lists */
-dd {}
-dl {}
-dt {
- display: inline;
- float: left;
+@-webkit-keyframes welcome {
+ from {
+ -webkit-transform: scale(0);
+ opacity: 0;
+ }
+ 50% {
+ -webkit-transform: scale(0);
+ opacity: 0;
+ }
+ 82.5% {
+ -webkit-transform: scale(1.03);
+ -webkit-animation-timing-function: ease-out;
+ opacity: 1;
+ }
+ to {
+ -webkit-transform: scale(1);
+ }
}
diff --git a/content/stylesheets/normalize.css b/content/stylesheets/normalize.css
new file mode 100644
index 0000000..73abb76
--- /dev/null
+++ b/content/stylesheets/normalize.css
@@ -0,0 +1,375 @@
+/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
+
+/* ==========================================================================
+ HTML5 display definitions
+ ========================================================================== */
+
+/*
+ * Corrects `block` display not defined in IE 8/9.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section,
+summary {
+ display: block;
+}
+
+/*
+ * Corrects `inline-block` display not defined in IE 8/9.
+ */
+
+audio,
+canvas,
+video {
+ display: inline-block;
+}
+
+/*
+ * Prevents modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+ display: none;
+ height: 0;
+}
+
+/*
+ * Addresses styling for `hidden` attribute not present in IE 8/9.
+ */
+
+[hidden] {
+ display: none;
+}
+
+/* ==========================================================================
+ Base
+ ========================================================================== */
+
+/*
+ * 1. Sets default font family to sans-serif.
+ * 2. Prevents iOS text size adjust after orientation change, without disabling
+ * user zoom.
+ */
+
+html {
+ font-family: sans-serif; /* 1 */
+ -webkit-text-size-adjust: 100%; /* 2 */
+ -ms-text-size-adjust: 100%; /* 2 */
+}
+
+/*
+ * Removes default margin.
+ */
+
+body {
+ margin: 0;
+}
+
+/* ==========================================================================
+ Links
+ ========================================================================== */
+
+/*
+ * Addresses `outline` inconsistency between Chrome and other browsers.
+ */
+
+a:focus {
+ outline: thin dotted;
+}
+
+/*
+ * Improves readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+ outline: 0;
+}
+
+/* ==========================================================================
+ Typography
+ ========================================================================== */
+
+/*
+ * Addresses `h1` font sizes within `section` and `article` in Firefox 4+,
+ * Safari 5, and Chrome.
+ */
+
+h1 {
+ font-size: 2em;
+}
+
+/*
+ * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
+ */
+
+abbr[title] {
+ border-bottom: 1px dotted;
+}
+
+/*
+ * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
+
+b,
+strong {
+ font-weight: bold;
+}
+
+/*
+ * Addresses styling not present in Safari 5 and Chrome.
+ */
+
+dfn {
+ font-style: italic;
+}
+
+/*
+ * Addresses styling not present in IE 8/9.
+ */
+
+mark {
+ background: #ff0;
+ color: #000;
+}
+
+
+/*
+ * Corrects font family set oddly in Safari 5 and Chrome.
+ */
+
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, serif;
+ font-size: 1em;
+}
+
+/*
+ * Improves readability of pre-formatted text in all browsers.
+ */
+
+pre {
+ white-space: pre;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+}
+
+/*
+ * Sets consistent quote types.
+ */
+
+q {
+ quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/*
+ * Addresses inconsistent and variable font size in all browsers.
+ */
+
+small {
+ font-size: 80%;
+}
+
+/*
+ * Prevents `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sup {
+ top: -0.5em;
+}
+
+sub {
+ bottom: -0.25em;
+}
+
+/* ==========================================================================
+ Embedded content
+ ========================================================================== */
+
+/*
+ * Removes border when inside `a` element in IE 8/9.
+ */
+
+img {
+ border: 0;
+}
+
+/*
+ * Corrects overflow displayed oddly in IE 9.
+ */
+
+svg:not(:root) {
+ overflow: hidden;
+}
+
+/* ==========================================================================
+ Figures
+ ========================================================================== */
+
+/*
+ * Addresses margin not present in IE 8/9 and Safari 5.
+ */
+
+figure {
+ margin: 0;
+}
+
+/* ==========================================================================
+ Forms
+ ========================================================================== */
+
+/*
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+ border: 1px solid #c0c0c0;
+ margin: 0 2px;
+ padding: 0.35em 0.625em 0.75em;
+}
+
+/*
+ * 1. Corrects color not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+ border: 0; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/*
+ * 1. Corrects font family not being inherited in all browsers.
+ * 2. Corrects font size not being inherited in all browsers.
+ * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
+ */
+
+button,
+input,
+select,
+textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 2 */
+ margin: 0; /* 3 */
+}
+
+/*
+ * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+button,
+input {
+ line-height: normal;
+}
+
+/*
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ * and `video` controls.
+ * 2. Corrects inability to style clickable `input` types in iOS.
+ * 3. Improves usability and consistency of cursor style between image-type
+ * `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+ -webkit-appearance: button; /* 2 */
+ cursor: pointer; /* 3 */
+}
+
+/*
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+input[disabled] {
+ cursor: default;
+}
+
+/*
+ * 1. Addresses box sizing set to `content-box` in IE 8/9.
+ * 2. Removes excess padding in IE 8/9.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+ box-sizing: border-box; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/*
+ * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
+ * (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+ -webkit-appearance: textfield; /* 1 */
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box; /* 2 */
+ box-sizing: content-box;
+}
+
+/*
+ * Removes inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+
+/*
+ * Removes inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ border: 0;
+ padding: 0;
+}
+
+/*
+ * 1. Removes default vertical scrollbar in IE 8/9.
+ * 2. Improves readability and alignment in all browsers.
+ */
+
+textarea {
+ overflow: auto; /* 1 */
+ vertical-align: top; /* 2 */
+}
+
+/* ==========================================================================
+ Tables
+ ========================================================================== */
+
+/*
+ * Remove most spacing between table cells.
+ */
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
\ No newline at end of file
diff --git a/content/who b/content/who
index 11dba4d..b7ec893 100644
--- a/content/who
+++ b/content/who
@@ -16,6 +16,7 @@
<h2 id="pmc">PMC</h2>
+<<<<<<< HEAD
<p>Active Project Management Committee contains (in alphabetical order of their usernames):</p>
<table class="table-bordered">
@@ -204,6 +205,53 @@
</tr>
</tbody>
</table>
+=======
+<p class="table-bordered">Active Project Management Committee contains (in alphabetical order of their usernames):</p>
+<p>| Username | Name |
+|———-|——|
+|akarasulu|Alex Karasulu|
+|alena1108|Alena Prokharchyk|
+|animesh|Animesh|
+|boris|Boris Schrijver|
+|chipchilders|Chip Childers|
+|chiradeep|Chiradeep Vittal|
+|dahn|Daan|
+|ekho|Wilder Rodrigues|
+|erikw|Erik Weber|
+|giles|Giles Sirett|
+|gochiba|Go Chiba|
+|hogstrom|Matt Richard Hogstrom|
+|hugo|Hugo Trippaers|
+|ilya|Ilya Musayev|
+|jburwell|John Burwell|
+|jlk|John Kinsella|
+|jzb|Joe Brockmeier|
+|karenv|Karen Vuong|
+|ke4qqq|David Nalley|
+|kluge|Kevin Kluge|
+|milamber|Bruno Demion|
+|mlsorensen|Marcus Sorensen|
+|mnour|Mohammad Nour El-Din|
+|mrhinkle|Mark R. Hinkle|
+|mtutkowski|Mike Tutkowski|
+|nslater|Naomi Slater|
+|nux|Nux|
+|paul_a|Paul Angus|
+|pdion891|Pierre-Luc Dion|
+|rafael|Rafael Weingärtner|
+|rajani|Rajani Karuturi|
+|remi|Remi Bergsma|
+|resmo|Rene Moser|
+|rohit|Rohit Yadav|
+|sebgoa|Sebastien Goasguen|
+|sweller|Simon Weller|
+|swill|Will Stevens|
+|syed|Syed Ahmed|
+|tsp|Prasanna|
+|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>
@@ -219,6 +267,7 @@
<p>Active list of committers (in alphabetical order of their usernames)</p>
+<<<<<<< HEAD
<table class="table-bordered">
<thead>
<tr>
@@ -677,6 +726,128 @@
</tr>
</tbody>
</table>
+=======
+<p class="table-bordered">Active list of committers (in alphabetical order of their usernames):</p>
+<p>| Username | Name |
+|———-|——|
+|ahmad|Ahmad Emneina|
+|akarasulu|Alex Karasulu|
+|alena1108|Alena Prokharchyk|
+|amoghvk|Amogh Vasekar|
+|andrijapanic|Andrija Panic|
+|animesh|Animesh|
+|anthonyxu|Anthony Xu|
+|aprateek|Abhinandan Prateek|
+|bfederle|Brian Federle|
+|boris|Boris Schrijver|
+|brett|Brett Porter|
+|bstoyanov|Boris Stoyanov|
+|chipchilders|Chip Childers|
+|chiradeep|Chiradeep Vittal|
+|claytonweise|Clayton Weise|
+|csuich2|Chris Suich|
+|dahn|Daan|
+|darren|Darren Shepherd|
+|dcahill|Dave Cahill|
+|demetriust|Demetrius Tsitrelis|
+|devdeep|Devdeep Singh|
+|dkonrad|Dennis Konrad|
+|dsonstebo|Dag Sonstebo|
+|ekho|Wilder Rodrigues|
+|erikw|Erik Weber|
+|fmaximus|Frank Maximus|
+|frankzhang|Xin Zhang|
+|gabriel|Gabriel Beims Bräscher|
+|gaurav|Gaurav Nandkumar Aradhye|
+|gavinlee|Gavin Lee|
+|giles|Giles Sirett|
+|girish|Girish Prabhakar Shilamkar|
+|gochiba|Go Chiba|
+|haeena|Toshiaki Hatano|
+|harikrishna|Harikrishna Patnala|
+|higster|Geoff Higginbottom|
+|hogstrom|Matt Richard Hogstrom|
+|hugo|Hugo Trippaers|
+|ilya|Ilya Musayev|
+|isaacchiang|Isaac Chiang|
+|jayapal|Jayapal|
+|jbausewein|Jason Bausewein|
+|jburwell|John Burwell|
+|jessicawang|Jessica Wang|
+|jim|Jim Jagielski|
+|jlk|John Kinsella|
+|jtomechak|Jessica Tomechak|
+|jzb|Joe Brockmeier|
+|karenv|Karen Vuong|
+|kawai|Hiroaki Kawai|
+|kdamage|Kelcey Damage|
+|ke4qqq|David Nalley|
+|kelveny|Kelven Yang|
+|kirk|Kirk Kosinski|
+|kishan|Kishan|
+|kluge|Kevin Kluge|
+|kocka|Laszlo Hornyak|
+|koushik|Koushik Das|
+|likithas|Likitha Shetty|
+|marcaurele|Marc-Aurèle Brothier|
+|mchen|Min Chen|
+|mice|Mice Xia|
+|milamber|Bruno Demion|
+|mlsorensen|Marcus Sorensen|
+|mnour|Mohammad Nour El-Din|
+|mrhinkle|Mark R. Hinkle|
+|msinhore|Marco Sinhoreli|
+|mtutkowski|Mike Tutkowski|
+|muralireddy|Murali Mohan Reddy|
+|nathanejohnson|Nathan Johnson|
+|nitin|Nitin|
+|noa|Noa Resare|
+|nslater|Naomi Slater|
+|nux|Nux|
+|nvazquez|Nicolás Vázquez|
+|olgasmola|Olga Smola|
+|paul_a|Paul Angus|
+|pdion891|Pierre-Luc Dion|
+|pnguyen|Phong Nguyen|
+|prachidamle|Prachi Damle|
+|pranavs|Pranav Saxena|
+|pyr|Pierre-Yves Ritschard|
+|radhika|Radhika Nair|
+|rafael|Rafael Weingärtner|
+|rajani|Rajani Karuturi|
+|rajeshbattala|Rajesh Battala|
+|remi|Remi Bergsma|
+|resmo|Rene Moser|
+|rohit|Rohit Yadav|
+|sailajamada|Sailaja Mada|
+|saksham|Saksham Srivastava|
+|sangeethah|Sangeetha Hariharan|
+|sanjaytripathi|Sanjay Tripathi|
+|sanjeev|Sanjeev Neelarapu|
+|santhoshedukulla|Santhosh|
+|sateesh|Sateesh Chodapuneedi|
+|schhen|Sonny Heng Chhen|
+|sebgoa|Sebastien Goasguen|
+|serg38|Sergey Levitskiy|
+|slriv|Sam Robertson|
+|snuf|Funs Kessen|
+|sowmya|Sowmya Krishnan|
+|sudhap|Sudhap|
+|svogel|Sven Vogel|
+|swamy|Venkata Swamy|
+|sweller|Simon Weller|
+|swill|Will Stevens|
+|syed|Syed Ahmed|
+|talluri|Srikanteswararao Talluri|
+|tsp|Prasanna|
+|tuna|Anh Tu Nguyen|
+|vijayendrabvs|Vijayendra Bhamidipati|
+|weizhou|Wei Zhou|
+|widodh|Wido den Hollander|
+|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>
diff --git a/content/who.html b/content/who.html
index a615319..7a35ea6 100644
--- a/content/who.html
+++ b/content/who.html
@@ -146,194 +146,51 @@
<h2 id="pmc">PMC</h2>
-<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 |
+|———-|——|
+|akarasulu|Alex Karasulu|
+|alena1108|Alena Prokharchyk|
+|animesh|Animesh|
+|boris|Boris Schrijver|
+|chipchilders|Chip Childers|
+|chiradeep|Chiradeep Vittal|
+|dahn|Daan|
+|ekho|Wilder Rodrigues|
+|erikw|Erik Weber|
+|giles|Giles Sirett|
+|gochiba|Go Chiba|
+|hogstrom|Matt Richard Hogstrom|
+|hugo|Hugo Trippaers|
+|ilya|Ilya Musayev|
+|jburwell|John Burwell|
+|jlk|John Kinsella|
+|jzb|Joe Brockmeier|
+|karenv|Karen Vuong|
+|ke4qqq|David Nalley|
+|kluge|Kevin Kluge|
+|milamber|Bruno Demion|
+|mlsorensen|Marcus Sorensen|
+|mnour|Mohammad Nour El-Din|
+|mrhinkle|Mark R. Hinkle|
+|mtutkowski|Mike Tutkowski|
+|nslater|Naomi Slater|
+|nux|Nux|
+|paul_a|Paul Angus|
+|pdion891|Pierre-Luc Dion|
+|rafael|Rafael Weingärtner|
+|rajani|Rajani Karuturi|
+|remi|Remi Bergsma|
+|resmo|Rene Moser|
+|rohit|Rohit Yadav|
+|sebgoa|Sebastien Goasguen|
+|sweller|Simon Weller|
+|swill|Will Stevens|
+|syed|Syed Ahmed|
+|tsp|Prasanna|
+|weizhou|Wei Zhou|
+|widodh|Wido den Hollander|
+|willchan|William Chan|</p>
<h2 id="emeritus-pmc-members">Emeritus PMC Members</h2>
<p>PMC members who are no longer active include:</p>
@@ -349,464 +206,126 @@
<p>Active list of committers (in alphabetical order of their usernames)</p>
-<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 |
+|———-|——|
+|ahmad|Ahmad Emneina|
+|akarasulu|Alex Karasulu|
+|alena1108|Alena Prokharchyk|
+|amoghvk|Amogh Vasekar|
+|andrijapanic|Andrija Panic|
+|animesh|Animesh|
+|anthonyxu|Anthony Xu|
+|aprateek|Abhinandan Prateek|
+|bfederle|Brian Federle|
+|boris|Boris Schrijver|
+|brett|Brett Porter|
+|bstoyanov|Boris Stoyanov|
+|chipchilders|Chip Childers|
+|chiradeep|Chiradeep Vittal|
+|claytonweise|Clayton Weise|
+|csuich2|Chris Suich|
+|dahn|Daan|
+|darren|Darren Shepherd|
+|dcahill|Dave Cahill|
+|demetriust|Demetrius Tsitrelis|
+|devdeep|Devdeep Singh|
+|dkonrad|Dennis Konrad|
+|dsonstebo|Dag Sonstebo|
+|ekho|Wilder Rodrigues|
+|erikw|Erik Weber|
+|fmaximus|Frank Maximus|
+|frankzhang|Xin Zhang|
+|gabriel|Gabriel Beims Bräscher|
+|gaurav|Gaurav Nandkumar Aradhye|
+|gavinlee|Gavin Lee|
+|giles|Giles Sirett|
+|girish|Girish Prabhakar Shilamkar|
+|gochiba|Go Chiba|
+|haeena|Toshiaki Hatano|
+|harikrishna|Harikrishna Patnala|
+|higster|Geoff Higginbottom|
+|hogstrom|Matt Richard Hogstrom|
+|hugo|Hugo Trippaers|
+|ilya|Ilya Musayev|
+|isaacchiang|Isaac Chiang|
+|jayapal|Jayapal|
+|jbausewein|Jason Bausewein|
+|jburwell|John Burwell|
+|jessicawang|Jessica Wang|
+|jim|Jim Jagielski|
+|jlk|John Kinsella|
+|jtomechak|Jessica Tomechak|
+|jzb|Joe Brockmeier|
+|karenv|Karen Vuong|
+|kawai|Hiroaki Kawai|
+|kdamage|Kelcey Damage|
+|ke4qqq|David Nalley|
+|kelveny|Kelven Yang|
+|kirk|Kirk Kosinski|
+|kishan|Kishan|
+|kluge|Kevin Kluge|
+|kocka|Laszlo Hornyak|
+|koushik|Koushik Das|
+|likithas|Likitha Shetty|
+|marcaurele|Marc-Aurèle Brothier|
+|mchen|Min Chen|
+|mice|Mice Xia|
+|milamber|Bruno Demion|
+|mlsorensen|Marcus Sorensen|
+|mnour|Mohammad Nour El-Din|
+|mrhinkle|Mark R. Hinkle|
+|msinhore|Marco Sinhoreli|
+|mtutkowski|Mike Tutkowski|
+|muralireddy|Murali Mohan Reddy|
+|nathanejohnson|Nathan Johnson|
+|nitin|Nitin|
+|noa|Noa Resare|
+|nslater|Naomi Slater|
+|nux|Nux|
+|nvazquez|Nicolás Vázquez|
+|olgasmola|Olga Smola|
+|paul_a|Paul Angus|
+|pdion891|Pierre-Luc Dion|
+|pnguyen|Phong Nguyen|
+|prachidamle|Prachi Damle|
+|pranavs|Pranav Saxena|
+|pyr|Pierre-Yves Ritschard|
+|radhika|Radhika Nair|
+|rafael|Rafael Weingärtner|
+|rajani|Rajani Karuturi|
+|rajeshbattala|Rajesh Battala|
+|remi|Remi Bergsma|
+|resmo|Rene Moser|
+|rohit|Rohit Yadav|
+|sailajamada|Sailaja Mada|
+|saksham|Saksham Srivastava|
+|sangeethah|Sangeetha Hariharan|
+|sanjaytripathi|Sanjay Tripathi|
+|sanjeev|Sanjeev Neelarapu|
+|santhoshedukulla|Santhosh|
+|sateesh|Sateesh Chodapuneedi|
+|schhen|Sonny Heng Chhen|
+|sebgoa|Sebastien Goasguen|
+|serg38|Sergey Levitskiy|
+|slriv|Sam Robertson|
+|snuf|Funs Kessen|
+|sowmya|Sowmya Krishnan|
+|sudhap|Sudhap|
+|svogel|Sven Vogel|
+|swamy|Venkata Swamy|
+|sweller|Simon Weller|
+|swill|Will Stevens|
+|syed|Syed Ahmed|
+|talluri|Srikanteswararao Talluri|
+|tsp|Prasanna|
+|tuna|Anh Tu Nguyen|
+|vijayendrabvs|Vijayendra Bhamidipati|
+|weizhou|Wei Zhou|
+|widodh|Wido den Hollander|
+|willchan|William Chan|
+|yasker|Sheng Yang|
+|ynojima|Yoshikazu Nojima|</p>
<h2 id="emeritus-committers">Emeritus Committers</h2>
<p>Committers who are no longer active include:</p>
diff --git a/makewholist.py b/makewholist.py
old mode 100644
new mode 100755
index 27e4e56..0e5969f
--- a/makewholist.py
+++ b/makewholist.py
@@ -24,6 +24,7 @@
import json
import sys
import urllib
+import argparse
GROUPS_URL = "https://projects.apache.org/json/foundation/groups.json"
NAMES_URL = "https://projects.apache.org/json/foundation/people_name.json"
@@ -31,6 +32,8 @@
names = {} # Placeholder for names parsed in getNames()
groups = {} # Placeholder for groups parsed in getCommittersAndPMC()
+reload(sys)
+sys.setdefaultencoding('utf8')
def getCommittersAndPMC():
"""Get Committer and PMC info from ASF"""
@@ -52,7 +55,7 @@
print "Error during names JSON download or parsing: %s" % ex.message
-def printWhoList():
+def printWhoList(emeritus_members=''):
if len(names) == 0 or len(groups) == 0:
print "Names or groups not initialized, aborting"
sys.exit(1)
@@ -60,21 +63,35 @@
print ("Active Project Management Committee contains "
"(in alphabetical order of their usernames):")
+ print "{:.table-bordered}"
print "| Username | Name |"
print "|----------|------|"
for pmc in groups['cloudstack-pmc']:
- print "|%s|%s|" % (pmc, names[pmc])
+ if pmc not in emeritus_members.split(','):
+ print "|%s|%s|" % (pmc, names[pmc])
+
print ""
print ""
print ("Active list of committers "
"(in alphabetical order of their usernames):")
+
+ print "{:.table-bordered}"
print "| Username | Name |"
print "|----------|------|"
for committer in groups['cloudstack']:
- print "|%s|%s|" % (committer, names[committer])
+ if committer not in emeritus_members.split(','):
+ print "|%s|%s|" % (committer, names[committer])
if __name__ == "__main__":
+ # construct the argument parse and parse the arguments
+ ap = argparse.ArgumentParser()
+ ap.add_argument("-e", "--emeritusMembers", required=False, help="Emeritus PMCs and committers usernames (comma separated values).", default='')
+
+ args = vars(ap.parse_args())
+
+ emeritus_members = args["emeritusMembers"]
+
getNames()
getCommittersAndPMC()
- printWhoList()
+ printWhoList(emeritus_members)
diff --git a/source/about.markdown b/source/about.html.markdown
similarity index 100%
rename from source/about.markdown
rename to source/about.html.markdown
diff --git a/source/api.markdown b/source/api.html.markdown
similarity index 100%
rename from source/api.markdown
rename to source/api.html.markdown
diff --git a/source/api_archives.markdown b/source/api_archives.html.markdown
similarity index 100%
rename from source/api_archives.markdown
rename to source/api_archives.html.markdown
diff --git a/source/archives.md.erb b/source/archives.html.markdown.erb
similarity index 100%
rename from source/archives.md.erb
rename to source/archives.html.markdown.erb
diff --git a/source/bylaws.markdown b/source/bylaws.html.markdown
similarity index 100%
rename from source/bylaws.markdown
rename to source/bylaws.html.markdown
diff --git a/source/cloudstack-faq.markdown b/source/cloudstack-faq.html.markdown
similarity index 100%
rename from source/cloudstack-faq.markdown
rename to source/cloudstack-faq.html.markdown
diff --git a/source/contribute.markdown b/source/contribute.html.markdown
similarity index 100%
rename from source/contribute.markdown
rename to source/contribute.html.markdown
diff --git a/source/developers.markdown b/source/developers.html.markdown
similarity index 100%
rename from source/developers.markdown
rename to source/developers.html.markdown
diff --git a/source/downloads.html.erb b/source/downloads.html.erb
index e7e6ed2..65bd04f 100644
--- a/source/downloads.html.erb
+++ b/source/downloads.html.erb
@@ -307,20 +307,18 @@
<h4 id="source-release">Source Release</h4>
-<p>CloudMonkey's current release is 6.0.0.</p>
+<p>CloudMonkey's current release is <%= data.cloudstack.cloudmonkey.version %>.</p>
<p>
-<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the 6.0.0 Source</button></a>
+<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the <%= data.cloudstack.cloudmonkey.version %> Source</button></a>
<a href="http://www.apache.org/dist/cloudstack/KEYS"><button type="button" class="btn btn-info btn-xs">KEYS</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.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/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.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/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-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/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-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/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
</p>
-<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>
-
<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>
@@ -338,5 +336,10 @@
<h2 id="indicators">Archived Releases</h2>
You can find links to all the releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
-</div></div></div>
-
+</div></div>
+</div>
+ </div>
+ </div>
+</div>
+ </body>
+</html>
diff --git a/source/downloads.md.erb b/source/downloads.md.erb
deleted file mode 100644
index 4ef2ef2..0000000
--- a/source/downloads.md.erb
+++ /dev/null
@@ -1,216 +0,0 @@
----
-title: Apache CloudStack Downloads
----
-
-<%
- #
- # Version details in data/cloudstack.yml
- #
-%>
-<div class="row">
-
-<div class="col-lg-12">
-
-<div class="page-header">
-
-<h1 id="indicators">Apache CloudStack: Downloads</h1>
-
-</div>
-
-</div>
-
-</div>
-
-<div class="bs-example">
-
-<div class="row">
-
-<div class="col-lg-6">
-
-<h2>Latest CloudStack Releases</h2>
-<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 <%= data.cloudstack.versions.main %> and is an LTS release.
-</p>
-
-<p>
- <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%= data.cloudstack.versions.main %>-src.tar.bz2">
- <button type="button" class="btn btn-primary btn-md">
- Get the <%= data.cloudstack.versions.main %> Source
- </button>
- </a>
- <a href="http://www.apache.org/dist/cloudstack/KEYS">
- <button type="button" class="btn btn-info btn-xs">
- KEYS
- </button>
- </a>
- <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%= data.cloudstack.versions.main %>-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/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%= data.cloudstack.versions.main %>-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/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%= data.cloudstack.versions.main %>-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/en/<%= data.cloudstack.versions.main %>/releasenotes/">version <%= data.cloudstack.versions.main %> Release Notes</a> website.</p><br/>
-
-<p>Apache CloudStack's previous LTS release was <%= data.cloudstack.versions.lts %>.
-</p>
-
-<p>
- <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%= data.cloudstack.versions.lts %>-src.tar.bz2">
- <button type="button" class="btn btn-primary btn-md">
- Get the <%= data.cloudstack.versions.lts %> Source
- </button>
- </a>
- <a href="http://www.apache.org/dist/cloudstack/KEYS">
- <button type="button" class="btn btn-info btn-xs">
- KEYS
- </button>
- </a>
- <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%= data.cloudstack.versions.lts %>-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/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%= data.cloudstack.versions.lts %>-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/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%= data.cloudstack.versions.lts %>-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/<%= data.cloudstack.versions.lts %>/">version <%= data.cloudstack.versions.lts %> 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/en/4.11.2.0/installguide/">Installation Guide</a>. Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack <%= data.cloudstack.versions.main %> can be found in the upgrade section of the Release Notes (see above).</p>
-
-</div>
-
-<div class="col-lg-6">
-
-<div class="panel panel-default">
-
-<div class="panel-heading">
-
-<h3 class="panel-title">Verifying Downloads</h3>
-
-</div>
-
-<div class="panel-body">
-
-<p>
-It's essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures.
-The PGP signatures can be verified using PGP or GPG. First download the
-<a href="https://dist.apache.org/repos/dist/release/cloudstack/KEYS">KEYS</a> as well as the asc
-signature file for the relevant distribution. Make sure you get these files from the
-main distribution directory, rather than from a mirror. Then verify the signatures using:
-</p>
-<pre>
- % pgpk -a KEYS
- % pgpv apache-cloudstack-X.X.X-src.tar.bz2.asc
-</pre>
-<p>or</p>
-<pre>
- % pgp -ka KEYS
- % pgp apache-cloudstack-X.X.X-src.tar.bz2.asc
-</pre>
-<p>or</p>
-<pre>
- % gpg --import KEYS
- % gpg --verify apache-cloudstack-X.X.X-src.tar.bz2.asc
-</pre>
-<p>
-Additionally, you can verify the MD5 or SHA512 signatures on the files.
-</p>
-
-</div>
-</div>
-</div>
-</div>
-</div>
-
-<h2>Packages</h2>
-
-<h4>Community Packages</h4>
-<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have chosen to provide package repositories that also include noredis libraries.</p>
-
-<ul>
- <li>DEB repository: <a href="http://download.cloudstack.org/ubuntu">http://download.cloudstack.org/ubuntu</a></li>
- <li>CentOS/RHEL 6 RPM repository: <a href="http://download.cloudstack.org/centos/6/">http://download.cloudstack.org/centos/6/</a></li>
- <li>CentOS/RHEL 7 RPM repository: <a href="http://download.cloudstack.org/centos/7/">http://download.cloudstack.org/centos/7/</a></li>
-</ul>
-
-<p>Instructions for using these community provided repositories can be found in the <a href="http://docs.cloudstack.apache.org/en/4.11.2.0/installguide/management-server/#configure-package-repository">Configure Package Repository</a> section of the Installation Guide.</p>
-
-<h4>Packages hosted by 3rd Parties</h4>
-
-<ul>
- <li>CloudStack (noredist) Packages by ShapeBlue: <a href="http://shapeblue.com/packages/">http://shapeblue.com/packages</a></li>
-</ul>
-
-<div class="row">
-
-<div class="col-lg-12">
-
-<div class="page-header">
-
-<h2 id="cloudmonkey">Latest CloudMonkey Release</h2>
-
-</div>
-
-</div>
-
-</div>
-
-Apache CloudStack's CloudMonkey tool is a CLI and shell environment designed for interacting with CloudStack-based clouds.
-
-#### Source Release
-
-CloudMonkey's current release is <%= data.cloudstack.cloudmonkey.version %>.
-
-<p>
-<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the <%= data.cloudstack.cloudmonkey.version %> Source</button></a>
-
-<a href="http://www.apache.org/dist/cloudstack/KEYS"><button type="button" class="btn btn-info btn-xs">KEYS</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-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/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-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/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
-
-</p>
-
-Instructions for building and installing from source can be found in the included [README.md](https://gitbox.apache.org/repos/asf?p=cloudstack-cloudmonkey.git;a=blob_plain;f=README.md) file.
-
-#### Binary Builds Release
-
-For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the binary builds to the [Apache CloudStack CloudMonkey Github release](https://github.com/apache/cloudstack-cloudmonkey/releases) page.
-
-For installing, upgrade, usage, please see the project wiki:
-
- https://github.com/apache/cloudstack-cloudmonkey/wiki/Getting-Started#installation
-
-<a name="archives"></a>
-
-<div class="row">
-
-<div class="col-lg-12">
-
-<div class="page-header">
-
-<h2 id="indicators">Archived Releases</h2>
-
-You can find links to all the releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
diff --git a/source/features.markdown b/source/features.html.markdown
similarity index 100%
rename from source/features.markdown
rename to source/features.html.markdown
diff --git a/source/history.markdown b/source/history.html.markdown
similarity index 100%
rename from source/history.markdown
rename to source/history.html.markdown
diff --git a/source/images/background.png b/source/images/background.png
new file mode 100644
index 0000000..8681d44
--- /dev/null
+++ b/source/images/background.png
Binary files differ
diff --git a/source/images/middleman.png b/source/images/middleman.png
new file mode 100644
index 0000000..c685e56
--- /dev/null
+++ b/source/images/middleman.png
Binary files differ
diff --git a/source/index.html.erb b/source/index.html.erb
index e11d308..1139679 100644
--- a/source/index.html.erb
+++ b/source/index.html.erb
@@ -135,31 +135,40 @@
<ul type="disc">
<li>
<a
- href="https://www.meetup.com/german-CloudStack-user-group/"
+ href="https://www.meetup.com/de-DE/german-CloudStack-user-group/events/259269366/"
target="_blank"
>
- CloudStack European User Group
+ April CloudStack Meetup (Germany)
</a>
- , Frankfurt, 28<sup>th</sup> February
+ , Sankt Augustin (Bonn), 11<sup>th</sup> April
</li>
<li>
<a
- href="https://www.eventbrite.co.uk/e/cloudstack-european-user-group-ceph-day-tickets-42670526694"
+ href="http://br.cloudstackcollab.org/"
+ target="_blank"
>
- Cloudstack and Ceph day
+ CloudStack Collaboration Conference Brazil
</a>
- , London, 19<sup>th</sup> April
+ , Florianopolis, 26<sup>th</sup> April
</li>
<li>
- <a href="https://apachecon.com/">Apache EU Roadshow,</a>
- Berlin, 13-14 June
- </li>
- <li>
- <a href="http://cloudstackcollab.org/">
- CloudStack Collaboration Conference
+ <a
+ href="https://www.eventbrite.co.uk/e/cloudstack-european-user-group-meetup-tickets-55911193886"
+ target="_blank"
+ >
+ CloudStack European User Group meetup
</a>
- , Montreal, 24<sup>th</sup>-29<sup>th</sup> September
- </li>
+ , Sofia, 13<sup>th</sup> June
+ </li>
+ <li>
+ <a
+ href="http://us.cloudstackcollab.org/"
+ target="_blank"
+ >
+ CloudStack Collaboration Conference North America
+ </a>
+ , Las Vegas, 9<sup>th</sup> - 11<sup>th</sup> September
+ </li>
</ul>
<p>
View videos from previous CloudStack Collaboration Conferences:
@@ -167,6 +176,13 @@
<ul type="disc">
<li>
<a
+ href="https://www.youtube.com/playlist?list=PLU2OcwpQkYCwcPxZMKX2BFoKE0Z7g1ENH"
+ target="_blank">
+ CloudStack Collaboration Conference June 2018 in Montreal
+ </a>
+ </li>
+ <li>
+ <a
href="https://www.youtube.com/playlist?list=PLCfLScXpEyAS4YkJpeqDriP7JcU82Tx2r"
target="_blank">
CloudStack Collaboration Conference June 2016 in Montreal
diff --git a/source/mailing-lists.markdown b/source/mailing-lists.html.markdown
similarity index 100%
rename from source/mailing-lists.markdown
rename to source/mailing-lists.html.markdown
diff --git a/source/security.markdown b/source/security.html.markdown
similarity index 100%
rename from source/security.markdown
rename to source/security.html.markdown
diff --git a/source/software.markdown b/source/software.html.markdown
similarity index 100%
rename from source/software.markdown
rename to source/software.html.markdown
diff --git a/source/stylesheets/normalize.css b/source/stylesheets/normalize.css
new file mode 100644
index 0000000..73abb76
--- /dev/null
+++ b/source/stylesheets/normalize.css
@@ -0,0 +1,375 @@
+/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
+
+/* ==========================================================================
+ HTML5 display definitions
+ ========================================================================== */
+
+/*
+ * Corrects `block` display not defined in IE 8/9.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section,
+summary {
+ display: block;
+}
+
+/*
+ * Corrects `inline-block` display not defined in IE 8/9.
+ */
+
+audio,
+canvas,
+video {
+ display: inline-block;
+}
+
+/*
+ * Prevents modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+ display: none;
+ height: 0;
+}
+
+/*
+ * Addresses styling for `hidden` attribute not present in IE 8/9.
+ */
+
+[hidden] {
+ display: none;
+}
+
+/* ==========================================================================
+ Base
+ ========================================================================== */
+
+/*
+ * 1. Sets default font family to sans-serif.
+ * 2. Prevents iOS text size adjust after orientation change, without disabling
+ * user zoom.
+ */
+
+html {
+ font-family: sans-serif; /* 1 */
+ -webkit-text-size-adjust: 100%; /* 2 */
+ -ms-text-size-adjust: 100%; /* 2 */
+}
+
+/*
+ * Removes default margin.
+ */
+
+body {
+ margin: 0;
+}
+
+/* ==========================================================================
+ Links
+ ========================================================================== */
+
+/*
+ * Addresses `outline` inconsistency between Chrome and other browsers.
+ */
+
+a:focus {
+ outline: thin dotted;
+}
+
+/*
+ * Improves readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+ outline: 0;
+}
+
+/* ==========================================================================
+ Typography
+ ========================================================================== */
+
+/*
+ * Addresses `h1` font sizes within `section` and `article` in Firefox 4+,
+ * Safari 5, and Chrome.
+ */
+
+h1 {
+ font-size: 2em;
+}
+
+/*
+ * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
+ */
+
+abbr[title] {
+ border-bottom: 1px dotted;
+}
+
+/*
+ * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
+
+b,
+strong {
+ font-weight: bold;
+}
+
+/*
+ * Addresses styling not present in Safari 5 and Chrome.
+ */
+
+dfn {
+ font-style: italic;
+}
+
+/*
+ * Addresses styling not present in IE 8/9.
+ */
+
+mark {
+ background: #ff0;
+ color: #000;
+}
+
+
+/*
+ * Corrects font family set oddly in Safari 5 and Chrome.
+ */
+
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, serif;
+ font-size: 1em;
+}
+
+/*
+ * Improves readability of pre-formatted text in all browsers.
+ */
+
+pre {
+ white-space: pre;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+}
+
+/*
+ * Sets consistent quote types.
+ */
+
+q {
+ quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/*
+ * Addresses inconsistent and variable font size in all browsers.
+ */
+
+small {
+ font-size: 80%;
+}
+
+/*
+ * Prevents `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sup {
+ top: -0.5em;
+}
+
+sub {
+ bottom: -0.25em;
+}
+
+/* ==========================================================================
+ Embedded content
+ ========================================================================== */
+
+/*
+ * Removes border when inside `a` element in IE 8/9.
+ */
+
+img {
+ border: 0;
+}
+
+/*
+ * Corrects overflow displayed oddly in IE 9.
+ */
+
+svg:not(:root) {
+ overflow: hidden;
+}
+
+/* ==========================================================================
+ Figures
+ ========================================================================== */
+
+/*
+ * Addresses margin not present in IE 8/9 and Safari 5.
+ */
+
+figure {
+ margin: 0;
+}
+
+/* ==========================================================================
+ Forms
+ ========================================================================== */
+
+/*
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+ border: 1px solid #c0c0c0;
+ margin: 0 2px;
+ padding: 0.35em 0.625em 0.75em;
+}
+
+/*
+ * 1. Corrects color not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+ border: 0; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/*
+ * 1. Corrects font family not being inherited in all browsers.
+ * 2. Corrects font size not being inherited in all browsers.
+ * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
+ */
+
+button,
+input,
+select,
+textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 2 */
+ margin: 0; /* 3 */
+}
+
+/*
+ * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+button,
+input {
+ line-height: normal;
+}
+
+/*
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ * and `video` controls.
+ * 2. Corrects inability to style clickable `input` types in iOS.
+ * 3. Improves usability and consistency of cursor style between image-type
+ * `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+ -webkit-appearance: button; /* 2 */
+ cursor: pointer; /* 3 */
+}
+
+/*
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+input[disabled] {
+ cursor: default;
+}
+
+/*
+ * 1. Addresses box sizing set to `content-box` in IE 8/9.
+ * 2. Removes excess padding in IE 8/9.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+ box-sizing: border-box; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/*
+ * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
+ * (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+ -webkit-appearance: textfield; /* 1 */
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box; /* 2 */
+ box-sizing: content-box;
+}
+
+/*
+ * Removes inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+
+/*
+ * Removes inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ border: 0;
+ padding: 0;
+}
+
+/*
+ * 1. Removes default vertical scrollbar in IE 8/9.
+ * 2. Improves readability and alignment in all browsers.
+ */
+
+textarea {
+ overflow: auto; /* 1 */
+ vertical-align: top; /* 2 */
+}
+
+/* ==========================================================================
+ Tables
+ ========================================================================== */
+
+/*
+ * Remove most spacing between table cells.
+ */
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
\ No newline at end of file
diff --git a/source/survey.markdown b/source/survey.html.markdown
similarity index 100%
rename from source/survey.markdown
rename to source/survey.html.markdown
diff --git a/source/trademark-guidelines.markdown b/source/trademark-guidelines.html.markdown
similarity index 100%
rename from source/trademark-guidelines.markdown
rename to source/trademark-guidelines.html.markdown
diff --git a/source/users.markdown b/source/users.html.markdown
similarity index 100%
rename from source/users.markdown
rename to source/users.html.markdown
diff --git a/source/videos.markdown b/source/videos.html.markdown
similarity index 100%
rename from source/videos.markdown
rename to source/videos.html.markdown
diff --git a/source/who.markdown b/source/who.html.markdown
similarity index 91%
rename from source/who.markdown
rename to source/who.html.markdown
index 74a75c0..9a4cc42 100644
--- a/source/who.markdown
+++ b/source/who.html.markdown
@@ -21,11 +21,9 @@
## PMC
Active Project Management Committee contains (in alphabetical order of their usernames):
-
{:.table-bordered}
| Username | Name |
|----------|------|
-|ahuang|Alex Huang|
|akarasulu|Alex Karasulu|
|alena1108|Alena Prokharchyk|
|animesh|Animesh|
@@ -33,8 +31,6 @@
|chipchilders|Chip Childers|
|chiradeep|Chiradeep Vittal|
|dahn|Daan|
-|duffy|Ian Duffy|
-|edison|Disheng Su|
|ekho|Wilder Rodrigues|
|erikw|Erik Weber|
|giles|Giles Sirett|
@@ -43,7 +39,6 @@
|hugo|Hugo Trippaers|
|ilya|Ilya Musayev|
|jburwell|John Burwell|
-|jim|Jim Jagielski|
|jlk|John Kinsella|
|jzb|Joe Brockmeier|
|karenv|Karen Vuong|
@@ -56,17 +51,19 @@
|mtutkowski|Mike Tutkowski|
|nslater|Naomi Slater|
|nux|Nux|
-|olamy|Olivier Lamy|
|paul_a|Paul Angus|
|pdion891|Pierre-Luc Dion|
|rafael|Rafael Weingärtner|
|rajani|Rajani Karuturi|
|remi|Remi Bergsma|
+|resmo|Rene Moser|
|rohit|Rohit Yadav|
|sebgoa|Sebastien Goasguen|
|sweller|Simon Weller|
|swill|Will Stevens|
+|syed|Syed Ahmed|
|tsp|Prasanna|
+|weizhou|Wei Zhou|
|widodh|Wido den Hollander|
|willchan|William Chan|
@@ -82,20 +79,22 @@
Active list of committers (in alphabetical order of their usernames)
+Active list of committers (in alphabetical order of their usernames):
{:.table-bordered}
| Username | Name |
|----------|------|
|ahmad|Ahmad Emneina|
-|ahuang|Alex Huang|
|akarasulu|Alex Karasulu|
|alena1108|Alena Prokharchyk|
|amoghvk|Amogh Vasekar|
+|andrijapanic|Andrija Panic|
|animesh|Animesh|
|anthonyxu|Anthony Xu|
|aprateek|Abhinandan Prateek|
|bfederle|Brian Federle|
|boris|Boris Schrijver|
|brett|Brett Porter|
+|bstoyanov|Boris Stoyanov|
|chipchilders|Chip Childers|
|chiradeep|Chiradeep Vittal|
|claytonweise|Clayton Weise|
@@ -105,11 +104,13 @@
|dcahill|Dave Cahill|
|demetriust|Demetrius Tsitrelis|
|devdeep|Devdeep Singh|
-|duffy|Ian Duffy|
-|edison|Disheng Su|
+|dkonrad|Dennis Konrad|
+|dsonstebo|Dag Sonstebo|
|ekho|Wilder Rodrigues|
|erikw|Erik Weber|
+|fmaximus|Frank Maximus|
|frankzhang|Xin Zhang|
+|gabriel|Gabriel Beims Bräscher|
|gaurav|Gaurav Nandkumar Aradhye|
|gavinlee|Gavin Lee|
|giles|Giles Sirett|
@@ -141,6 +142,7 @@
|kocka|Laszlo Hornyak|
|koushik|Koushik Das|
|likithas|Likitha Shetty|
+|marcaurele|Marc-Aurèle Brothier|
|mchen|Min Chen|
|mice|Mice Xia|
|milamber|Bruno Demion|
@@ -150,12 +152,12 @@
|msinhore|Marco Sinhoreli|
|mtutkowski|Mike Tutkowski|
|muralireddy|Murali Mohan Reddy|
+|nathanejohnson|Nathan Johnson|
|nitin|Nitin|
|noa|Noa Resare|
|nslater|Naomi Slater|
|nux|Nux|
|nvazquez|Nicolás Vázquez|
-|olamy|Olivier Lamy|
|olgasmola|Olga Smola|
|paul_a|Paul Angus|
|pdion891|Pierre-Luc Dion|
@@ -184,6 +186,7 @@
|snuf|Funs Kessen|
|sowmya|Sowmya Krishnan|
|sudhap|Sudhap|
+|svogel|Sven Vogel|
|swamy|Venkata Swamy|
|sweller|Simon Weller|
|swill|Will Stevens|
