You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2017/01/28 16:36:37 UTC
[1/5] cloudstack-www git commit: updated the 2017 conference details
Repository: cloudstack-www
Updated Branches:
refs/heads/asf-site 9c258a01e -> 574c596eb
updated the 2017 conference details
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/0cd70b31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/0cd70b31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/0cd70b31
Branch: refs/heads/asf-site
Commit: 0cd70b3138ef73a2fa1e99bacadff880a7553a4e
Parents: 5c9f110
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Jan 26 16:08:52 2017 -0500
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Jan 26 16:08:52 2017 -0500
----------------------------------------------------------------------
source/index.html.erb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/0cd70b31/source/index.html.erb
----------------------------------------------------------------------
diff --git a/source/index.html.erb b/source/index.html.erb
index 85a35d7..5cd0593 100644
--- a/source/index.html.erb
+++ b/source/index.html.erb
@@ -113,22 +113,23 @@ Join Us
<div class="panel-body" id="events">
- <h4>2016 CloudStack Collaboration Conferences</h4>
+ <h4>2017 CloudStack Collaboration Conferences</h4>
<p>
- In 2016, two Apache <a href="http://cloudstackcollab.org/">CloudStack Collaboration Conferences</a> events will be held in the Americas. Each event will feature morning plenary sessions, afternoon breakout sessions in user and developer tracks and a hackathon. Learn more at:
+ In 2017, two Apache <a href="http://cloudstackcollab.org/">CloudStack Collaboration Conference</a> events will be held in the Americas. Each event will feature a lot of opportunities to learn, collaborate and engage with the CloudStack community. The CloudStack Collaboration Conferences are valuable for both developers and users, and are a great way to get involved with the community.
</p>
<p>
<ul>
- <li><a href="http://cloudstack.usp.br/">Sao Paulo, Brasil automn 2016, date to be determined</a></li>
+ <li><a href="http://us.cloudstackcollab.org/" target="_blank">Miami, Florida, USA | May 16-18, 2017 </a></li>
+ <li><a href="javascript:void(0)">Sao Paulo, Brazil | Autumn 2017, date to be determined</a></li>
</ul>
</p>
<p>
View videos from previous CloudStack Collaboration Conferences:
<ul>
- <li><a href="http://ca.cloudstackcollab.org/">CloudStack Collaboration Conference June 2016 in Montreal</a></li>
- <li><a href="https://www.youtube.com/playlist?list=PLGeM09tlguZSeNyOyQKJHNX4pxgK-yoTA">CloudStack Collaboration Conference Europe 2015 in Dublin</a></li>
+ <li><a href="https://www.youtube.com/playlist?list=PLCfLScXpEyAS4YkJpeqDriP7JcU82Tx2r" target="_blank">CloudStack Collaboration Conference June 2016 in Montreal</a></li>
+ <li><a href="https://www.youtube.com/playlist?list=PLGeM09tlguZSeNyOyQKJHNX4pxgK-yoTA" target="_blank">CloudStack Collaboration Conference Europe 2015 in Dublin</a></li>
</ul>
</p>
@@ -142,7 +143,7 @@ Join Us
</div>
<div class="panel-body">
- <a class="twitter-timeline" href="https://twitter.com/search?q=cloudstack" data-widget-id="383337162126544896" data-chrome="nofooter transparent noheader noborders noscrollbar">Tweets about "cloudstack"</a>
+ <a class="twitter-timeline" href="https://twitter.com/search?q=cloudstack" data-widget-id="383337162126544896" data-chrome="nofooter transparent noheader noborders noscrollbar">Tweets about "CloudStack"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
[4/5] cloudstack-www git commit: fixed some malformed html which was
causing the security page to render incorrectly
Posted by sw...@apache.org.
fixed some malformed html which was causing the security page to render incorrectly
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/ff1b584f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/ff1b584f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/ff1b584f
Branch: refs/heads/asf-site
Commit: ff1b584f3cd721eebd33db17ae79631a0b768e18
Parents: e5c333e
Author: Will Stevens <wi...@gmail.com>
Authored: Fri Jan 27 16:19:11 2017 -0500
Committer: Will Stevens <wi...@gmail.com>
Committed: Fri Jan 27 16:19:11 2017 -0500
----------------------------------------------------------------------
content/security.html | 61 ++++++++++++++++++++++---------------------
source/security.markdown | 48 ++++++++++++++++++----------------
2 files changed, 56 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/ff1b584f/content/security.html
----------------------------------------------------------------------
diff --git a/content/security.html b/content/security.html
index a795052..4dde34a 100644
--- a/content/security.html
+++ b/content/security.html
@@ -162,38 +162,39 @@
<h2 id="procedure-for-responding-to-potential-security-issues">Procedure for Responding to Potential Security Issues</h2>
<ul>
- <li> Upon receiving notice of a potential security issue, a security team member will create a bug to track the investigation, this bug must be flagged as a security issue. Security flag should mean contents of ticket are not visible to non-security team members
- <li> Security team investigates the issue to confirm/deny the presence of a vulnerability within CloudStack
- <li> If the issue is determined not to be a vulnerability the reporter will be notified and the issue will be closed as invalid
- <li> If issue is confirmed as a CloudStack vulnerability:
- <ul>
- <li> Security team notifies the Apache Security team
- <li> Security team assigns a risk rating to the vulnerability using the Common Vulnerability Scoring System
- <li> Security team works with reporter to get a chance to investigate and mitigate the issue in a timely manner before public announcement. This should be between 15-30 days, depending on the severity and complexity of the issue
- <li> Security team works with Apache Security Team to reserve a CVE Identifier for future public release
- <li> Security team works with appropriate code maintainer(s) to create patch to mitigate the issue
- <li> Testing is conducted to verify patch mitigates issue and does not cause regression errors
- <li> Security team creates a vulnerability announcement
- <li> Patch is committed to trunk and other supported branches that are affected. The commit should not refer to a particular vulnerability
- <li> A new CloudStack release or hotfix is prepared and tested, containing the new security patch
- <li> Distributor coordination is implemented to enable a coordinated announcement
- <li> Security team posts vulnerability announcement to...
+ <li>Upon receiving notice of a potential security issue, a security team member will create a bug to track the investigation, this bug must be flagged as a security issue. Security flag should mean contents of ticket are not visible to non-security team members</li>
+ <li>Security team investigates the issue to confirm/deny the presence of a vulnerability within CloudStack</li>
+ <li>If the issue is determined not to be a vulnerability the reporter will be notified and the issue will be closed as invalid</li>
+ <li>If issue is confirmed as a CloudStack vulnerability:
<ul>
- <li> CloudStack dev list
- <li> CloudStack users list
- <li> The Bugtraq mailing list
- </ul>
- <li> After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement.
- <li> Also after announcement, modify the Jira ticket so that the issue is now publicly viewable.
- </ul>
- <li> After the vulnerability is addressed, the CloudStack community should review development processes to see how the community can minimize the chance of similar vulnerabilities being introduced in the future.
-</ul>
+ <li>Security team notifies the Apache Security team</li>
+ <li>Security team assigns a risk rating to the vulnerability using the Common Vulnerability Scoring System</li>
+ <li>Security team works with reporter to get a chance to investigate and mitigate the issue in a timely manner before public announcement. This should be between 15-30 days, depending on the severity and complexity of the issue</li>
+ <li>Security team works with Apache Security Team to reserve a CVE Identifier for future public release</li>
+ <li>Security team works with appropriate code maintainer(s) to create patch to mitigate the issue</li>
+ <li>Testing is conducted to verify patch mitigates issue and does not cause regression errors</li>
+ <li>Security team creates a vulnerability announcement</li>
+ <li>Patch is committed to trunk and other supported branches that are affected. The commit should not refer to a particular vulnerability</li>
+ <li>A new CloudStack release or hotfix is prepared and tested, containing the new security patch</li>
+ <li>Distributor coordination is implemented to enable a coordinated announcement</li>
+ <li>Security team posts vulnerability announcement to...
+ <ul>
+ <li>CloudStack dev list</li>
+ <li>CloudStack users list</li>
+ <li>The Bugtraq mailing list</li>
+ </ul>
+ </li>
+ <li>After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement.</li>
+ <li>Also after announcement, modify the Jira ticket so that the issue is now publicly viewable.</li>
+ </ul>
+ </li>
+ <li>After the vulnerability is addressed, the CloudStack community should review development processes to see how the community can minimize the chance of similar vulnerabilities being introduced in the future.</li>
+</ul>
+
+<h2 id="for-further-information">For further information</h2>
+
+<p>Further information about Apache CloudStack's security practices can be found in the <a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Security">CloudStack Security wiki page</a>.</p>
-## For further information
-
-Further information about Apache CloudStack's security practices can be found in the [CloudStack Security wiki page](https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Security).
-
-</li></li></li></li></li></li></ul></li></li></li></li></li></li></li></li></li></li></li></ul></li></li></li></li></ul>
<footer>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/ff1b584f/source/security.markdown
----------------------------------------------------------------------
diff --git a/source/security.markdown b/source/security.markdown
index ab6523e..a8ab789 100644
--- a/source/security.markdown
+++ b/source/security.markdown
@@ -39,31 +39,33 @@ The security team asks that you **please do not create publicly-viewable JIRA ti
## Procedure for Responding to Potential Security Issues
<ul>
- <li> Upon receiving notice of a potential security issue, a security team member will create a bug to track the investigation, this bug must be flagged as a security issue. Security flag should mean contents of ticket are not visible to non-security team members
- <li> Security team investigates the issue to confirm/deny the presence of a vulnerability within CloudStack
- <li> If the issue is determined not to be a vulnerability the reporter will be notified and the issue will be closed as invalid
- <li> If issue is confirmed as a CloudStack vulnerability:
- <ul>
- <li> Security team notifies the Apache Security team
- <li> Security team assigns a risk rating to the vulnerability using the Common Vulnerability Scoring System
- <li> Security team works with reporter to get a chance to investigate and mitigate the issue in a timely manner before public announcement. This should be between 15-30 days, depending on the severity and complexity of the issue
- <li> Security team works with Apache Security Team to reserve a CVE Identifier for future public release
- <li> Security team works with appropriate code maintainer(s) to create patch to mitigate the issue
- <li> Testing is conducted to verify patch mitigates issue and does not cause regression errors
- <li> Security team creates a vulnerability announcement
- <li> Patch is committed to trunk and other supported branches that are affected. The commit should not refer to a particular vulnerability
- <li> A new CloudStack release or hotfix is prepared and tested, containing the new security patch
- <li> Distributor coordination is implemented to enable a coordinated announcement
- <li> Security team posts vulnerability announcement to...
+ <li>Upon receiving notice of a potential security issue, a security team member will create a bug to track the investigation, this bug must be flagged as a security issue. Security flag should mean contents of ticket are not visible to non-security team members</li>
+ <li>Security team investigates the issue to confirm/deny the presence of a vulnerability within CloudStack</li>
+ <li>If the issue is determined not to be a vulnerability the reporter will be notified and the issue will be closed as invalid</li>
+ <li>If issue is confirmed as a CloudStack vulnerability:
<ul>
- <li> CloudStack dev list
- <li> CloudStack users list
- <li> The Bugtraq mailing list
+ <li>Security team notifies the Apache Security team</li>
+ <li>Security team assigns a risk rating to the vulnerability using the Common Vulnerability Scoring System</li>
+ <li>Security team works with reporter to get a chance to investigate and mitigate the issue in a timely manner before public announcement. This should be between 15-30 days, depending on the severity and complexity of the issue</li>
+ <li>Security team works with Apache Security Team to reserve a CVE Identifier for future public release</li>
+ <li>Security team works with appropriate code maintainer(s) to create patch to mitigate the issue</li>
+ <li>Testing is conducted to verify patch mitigates issue and does not cause regression errors</li>
+ <li>Security team creates a vulnerability announcement</li>
+ <li>Patch is committed to trunk and other supported branches that are affected. The commit should not refer to a particular vulnerability</li>
+ <li>A new CloudStack release or hotfix is prepared and tested, containing the new security patch</li>
+ <li>Distributor coordination is implemented to enable a coordinated announcement</li>
+ <li>Security team posts vulnerability announcement to...
+ <ul>
+ <li>CloudStack dev list</li>
+ <li>CloudStack users list</li>
+ <li>The Bugtraq mailing list</li>
+ </ul>
+ </li>
+ <li>After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement.</li>
+ <li>Also after announcement, modify the Jira ticket so that the issue is now publicly viewable.</li>
</ul>
- <li> After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement.
- <li> Also after announcement, modify the Jira ticket so that the issue is now publicly viewable.
- </ul>
- <li> After the vulnerability is addressed, the CloudStack community should review development processes to see how the community can minimize the chance of similar vulnerabilities being introduced in the future.
+ </li>
+ <li>After the vulnerability is addressed, the CloudStack community should review development processes to see how the community can minimize the chance of similar vulnerabilities being introduced in the future.</li>
</ul>
## For further information
[2/5] cloudstack-www git commit: fixed the copyright date
Posted by sw...@apache.org.
fixed the copyright date
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/7b5e6bff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/7b5e6bff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/7b5e6bff
Branch: refs/heads/asf-site
Commit: 7b5e6bffe305e142fa2c9b9a86588763b03d96f3
Parents: 0cd70b3
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Jan 26 16:59:35 2017 -0500
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Jan 26 16:59:35 2017 -0500
----------------------------------------------------------------------
source/layouts/layout.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/7b5e6bff/source/layouts/layout.erb
----------------------------------------------------------------------
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 3cfc54a..301833d 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -128,7 +128,7 @@
<%= yield %>
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
[3/5] cloudstack-www git commit: updated the 'content' directory
Posted by sw...@apache.org.
updated the 'content' directory
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/e5c333e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/e5c333e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/e5c333e2
Branch: refs/heads/asf-site
Commit: e5c333e291488c8240c6ed01cf8420f0274d214a
Parents: 7b5e6bf
Author: Will Stevens <wi...@gmail.com>
Authored: Fri Jan 27 16:06:57 2017 -0500
Committer: Will Stevens <wi...@gmail.com>
Committed: Fri Jan 27 16:06:57 2017 -0500
----------------------------------------------------------------------
content/about.html | 2 +-
content/api.html | 2 +-
content/api_archives.html | 2 +-
content/archives.html | 2 +-
content/bylaws.html | 2 +-
content/cloudstack-faq.html | 2 +-
content/contribute.html | 2 +-
content/developers.html | 2 +-
content/downloads.html | 2 +-
content/features.html | 2 +-
content/history.html | 2 +-
content/index.html | 15 ++++++++-------
content/mailing-lists.html | 2 +-
content/security.html | 8 ++++----
content/software.html | 2 +-
content/survey.html | 2 +-
content/trademark-guidelines.html | 2 +-
content/users.html | 2 +-
content/videos.html | 2 +-
content/who.html | 2 +-
20 files changed, 30 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/about.html
----------------------------------------------------------------------
diff --git a/content/about.html b/content/about.html
index c9b4e82..78e171e 100644
--- a/content/about.html
+++ b/content/about.html
@@ -166,7 +166,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/api.html
----------------------------------------------------------------------
diff --git a/content/api.html b/content/api.html
index b540d73..2052a6a 100644
--- a/content/api.html
+++ b/content/api.html
@@ -172,7 +172,7 @@ or by submitting a patch.</p>
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/api_archives.html
----------------------------------------------------------------------
diff --git a/content/api_archives.html b/content/api_archives.html
index d34d838..268f63a 100644
--- a/content/api_archives.html
+++ b/content/api_archives.html
@@ -206,7 +206,7 @@ or by submitting a patch.</p>
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/archives.html
----------------------------------------------------------------------
diff --git a/content/archives.html b/content/archives.html
index 3f2fea5..0d53ca6 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -221,7 +221,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/bylaws.html
----------------------------------------------------------------------
diff --git a/content/bylaws.html b/content/bylaws.html
index 57d3557..63a23b7 100644
--- a/content/bylaws.html
+++ b/content/bylaws.html
@@ -511,7 +511,7 @@ voters time to consider the vote.</p>
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/cloudstack-faq.html
----------------------------------------------------------------------
diff --git a/content/cloudstack-faq.html b/content/cloudstack-faq.html
index 7c2aedc..b3c9fd4 100644
--- a/content/cloudstack-faq.html
+++ b/content/cloudstack-faq.html
@@ -188,7 +188,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/contribute.html
----------------------------------------------------------------------
diff --git a/content/contribute.html b/content/contribute.html
index 7ccc39f..9373b2c 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -159,7 +159,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/developers.html
----------------------------------------------------------------------
diff --git a/content/developers.html b/content/developers.html
index 69b6b7d..8be1f01 100644
--- a/content/developers.html
+++ b/content/developers.html
@@ -295,7 +295,7 @@ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index 3938926..3e4dbd1 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -352,7 +352,7 @@ You can find links to older releases of Apache CloudStack on the <a href="archiv
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/features.html
----------------------------------------------------------------------
diff --git a/content/features.html b/content/features.html
index 7f0be56..7924db0 100644
--- a/content/features.html
+++ b/content/features.html
@@ -311,7 +311,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/history.html
----------------------------------------------------------------------
diff --git a/content/history.html b/content/history.html
index f11d4c0..ba93ad2 100644
--- a/content/history.html
+++ b/content/history.html
@@ -152,7 +152,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 31e9319..1d07d98 100644
--- a/content/index.html
+++ b/content/index.html
@@ -236,22 +236,23 @@ Join Us
<div class="panel-body" id="events">
- <h4>2016 CloudStack Collaboration Conferences</h4>
+ <h4>2017 CloudStack Collaboration Conferences</h4>
<p>
- In 2016, two Apache <a href="http://cloudstackcollab.org/">CloudStack Collaboration Conferences</a> events will be held in the Americas. Each event will feature morning plenary sessions, afternoon breakout sessions in user and developer tracks and a hackathon. Learn more at:
+ In 2017, two Apache <a href="http://cloudstackcollab.org/">CloudStack Collaboration Conference</a> events will be held in the Americas. Each event will feature a lot of opportunities to learn, collaborate and engage with the CloudStack community. The CloudStack Collaboration Conferences are valuable for both developers and users, and are a great way to get involved with the community.
</p>
<p>
<ul>
- <li><a href="http://cloudstack.usp.br/">Sao Paulo, Brasil automn 2016, date to be determined</a></li>
+ <li><a href="http://us.cloudstackcollab.org/" target="_blank">Miami, Florida, USA | May 16-18, 2017 </a></li>
+ <li><a href="javascript:void(0)">Sao Paulo, Brazil | Autumn 2017, date to be determined</a></li>
</ul>
</p>
<p>
View videos from previous CloudStack Collaboration Conferences:
<ul>
- <li><a href="http://ca.cloudstackcollab.org/">CloudStack Collaboration Conference June 2016 in Montreal</a></li>
- <li><a href="https://www.youtube.com/playlist?list=PLGeM09tlguZSeNyOyQKJHNX4pxgK-yoTA">CloudStack Collaboration Conference Europe 2015 in Dublin</a></li>
+ <li><a href="https://www.youtube.com/playlist?list=PLCfLScXpEyAS4YkJpeqDriP7JcU82Tx2r" target="_blank">CloudStack Collaboration Conference June 2016 in Montreal</a></li>
+ <li><a href="https://www.youtube.com/playlist?list=PLGeM09tlguZSeNyOyQKJHNX4pxgK-yoTA" target="_blank">CloudStack Collaboration Conference Europe 2015 in Dublin</a></li>
</ul>
</p>
@@ -265,7 +266,7 @@ Join Us
</div>
<div class="panel-body">
- <a class="twitter-timeline" href="https://twitter.com/search?q=cloudstack" data-widget-id="383337162126544896" data-chrome="nofooter transparent noheader noborders noscrollbar">Tweets about "cloudstack"</a>
+ <a class="twitter-timeline" href="https://twitter.com/search?q=cloudstack" data-widget-id="383337162126544896" data-chrome="nofooter transparent noheader noborders noscrollbar">Tweets about "CloudStack"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
@@ -355,7 +356,7 @@ newEventList("events", "http://lanyrd.com/topics/apache-cloudstack/feed/");
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/mailing-lists.html
----------------------------------------------------------------------
diff --git a/content/mailing-lists.html b/content/mailing-lists.html
index 94e21f1..626e8b8 100644
--- a/content/mailing-lists.html
+++ b/content/mailing-lists.html
@@ -199,7 +199,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/security.html
----------------------------------------------------------------------
diff --git a/content/security.html b/content/security.html
index 1701ad4..a795052 100644
--- a/content/security.html
+++ b/content/security.html
@@ -182,12 +182,12 @@
<li> CloudStack dev list
<li> CloudStack users list
<li> The Bugtraq mailing list
-
+ </ul>
<li> After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement.
<li> Also after announcement, modify the Jira ticket so that the issue is now publicly viewable.
-
+ </ul>
<li> After the vulnerability is addressed, the CloudStack community should review development processes to see how the community can minimize the chance of similar vulnerabilities being introduced in the future.
-
+</ul>
## For further information
@@ -197,7 +197,7 @@ Further information about Apache CloudStack's security practices can be found in
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/software.html
----------------------------------------------------------------------
diff --git a/content/software.html b/content/software.html
index 97724fb..9e803d9 100644
--- a/content/software.html
+++ b/content/software.html
@@ -174,7 +174,7 @@ Apache CloudStack is open source software that forms the foundation for infrastr
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/survey.html
----------------------------------------------------------------------
diff --git a/content/survey.html b/content/survey.html
index d73d943..525880f 100644
--- a/content/survey.html
+++ b/content/survey.html
@@ -145,7 +145,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/trademark-guidelines.html
----------------------------------------------------------------------
diff --git a/content/trademark-guidelines.html b/content/trademark-guidelines.html
index 5a2397d..aaf6018 100644
--- a/content/trademark-guidelines.html
+++ b/content/trademark-guidelines.html
@@ -286,7 +286,7 @@ names is generally not "nominative fair use."</p>
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/users.html
----------------------------------------------------------------------
diff --git a/content/users.html b/content/users.html
index d5761de..35185bc 100644
--- a/content/users.html
+++ b/content/users.html
@@ -377,7 +377,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/videos.html
----------------------------------------------------------------------
diff --git a/content/videos.html b/content/videos.html
index a654cbe..26776a2 100644
--- a/content/videos.html
+++ b/content/videos.html
@@ -150,7 +150,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/e5c333e2/content/who.html
----------------------------------------------------------------------
diff --git a/content/who.html b/content/who.html
index 1cd7ee5..8581a8e 100644
--- a/content/who.html
+++ b/content/who.html
@@ -750,7 +750,7 @@
<footer>
- <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+ <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>
[5/5] cloudstack-www git commit: Merge branch 'master' into asf-site
Posted by sw...@apache.org.
Merge branch 'master' into asf-site
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/574c596e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/574c596e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/574c596e
Branch: refs/heads/asf-site
Commit: 574c596eb831bfabfa328a6c756aaa90f7d3c418
Parents: 9c258a0 ff1b584
Author: Will Stevens <wi...@gmail.com>
Authored: Fri Jan 27 16:26:23 2017 -0500
Committer: Will Stevens <wi...@gmail.com>
Committed: Fri Jan 27 16:26:23 2017 -0500
----------------------------------------------------------------------
content/about.html | 2 +-
content/api.html | 2 +-
content/api_archives.html | 2 +-
content/archives.html | 2 +-
content/bylaws.html | 2 +-
content/cloudstack-faq.html | 2 +-
content/contribute.html | 2 +-
content/developers.html | 2 +-
content/downloads.html | 2 +-
content/features.html | 2 +-
content/history.html | 2 +-
content/index.html | 15 ++++----
content/mailing-lists.html | 2 +-
content/security.html | 63 +++++++++++++++++-----------------
content/software.html | 2 +-
content/survey.html | 2 +-
content/trademark-guidelines.html | 2 +-
content/users.html | 2 +-
content/videos.html | 2 +-
content/who.html | 2 +-
source/index.html.erb | 13 +++----
source/layouts/layout.erb | 2 +-
source/security.markdown | 48 +++++++++++++-------------
23 files changed, 91 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/574c596e/content/api.html
----------------------------------------------------------------------