From 0cd70b3138ef73a2fa1e99bacadff880a7553a4e Mon Sep 17 00:00:00 2001 From: Will Stevens Date: Thu, 26 Jan 2017 16:08:52 -0500 Subject: [PATCH 1/4] updated the 2017 conference details --- source/index.html.erb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/source/index.html.erb b/source/index.html.erb index 85a35d7ff..5cd059330 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -113,22 +113,23 @@ Join Us
-

2016 CloudStack Collaboration Conferences

+

2017 CloudStack Collaboration Conferences

- In 2016, two Apache CloudStack Collaboration Conferences 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 CloudStack Collaboration Conference 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.

View videos from previous CloudStack Collaboration Conferences:

@@ -142,7 +143,7 @@ Join Us
- +
From 7b5e6bffe305e142fa2c9b9a86588763b03d96f3 Mon Sep 17 00:00:00 2001 From: Will Stevens Date: Thu, 26 Jan 2017 16:59:35 -0500 Subject: [PATCH 2/4] fixed the copyright date --- source/layouts/layout.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index 3cfc54a0d..301833de7 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -128,7 +128,7 @@ <%= yield %>
-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

From e5c333e291488c8240c6ed01cf8420f0274d214a Mon Sep 17 00:00:00 2001 From: Will Stevens Date: Fri, 27 Jan 2017 16:06:57 -0500 Subject: [PATCH 3/4] updated the 'content' directory --- 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(-) diff --git a/content/about.html b/content/about.html index c9b4e82b6..78e171e73 100644 --- a/content/about.html +++ b/content/about.html @@ -166,7 +166,7 @@

People of Apache CloudStack

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/api.html b/content/api.html index b540d73ab..2052a6a32 100644 --- a/content/api.html +++ b/content/api.html @@ -172,7 +172,7 @@

4.7.x

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/api_archives.html b/content/api_archives.html index d34d838a2..268f63ad5 100644 --- a/content/api_archives.html +++ b/content/api_archives.html @@ -206,7 +206,7 @@

4.0.x

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/archives.html b/content/archives.html index 3f2fea522..0d53ca63c 100644 --- a/content/archives.html +++ b/content/archives.html @@ -221,7 +221,7 @@

CloudMonkey release archives

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/bylaws.html b/content/bylaws.html index 57d3557b3..63a23b704 100644 --- a/content/bylaws.html +++ b/content/bylaws.html @@ -511,7 +511,7 @@

3. Decision Making

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/cloudstack-faq.html b/content/cloudstack-faq.html index 7c2aedc7a..b3c9fd49e 100644 --- a/content/cloudstack-faq.html +++ b/content/cloudstack-faq.html @@ -188,7 +188,7 @@

How are users,
-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/contribute.html b/content/contribute.html index 7ccc39f1d..9373b2c1e 100644 --- a/content/contribute.html +++ b/content/contribute.html @@ -159,7 +159,7 @@

Where To Ask For Help

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/developers.html b/content/developers.html index 69b6b7da8..8be1f019a 100644 --- a/content/developers.html +++ b/content/developers.html @@ -295,7 +295,7 @@

Git Repositories

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/downloads.html b/content/downloads.html index 393892697..3e4dbd142 100644 --- a/content/downloads.html +++ b/content/downloads.html @@ -352,7 +352,7 @@

Archived Releases

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/features.html b/content/features.html index 7f0be5690..7924db044 100644 --- a/content/features.html +++ b/content/features.html @@ -311,7 +311,7 @@

Description

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/history.html b/content/history.html index f11d4c043..ba93ad212 100644 --- a/content/history.html +++ b/content/history.html @@ -152,7 +152,7 @@

CloudStack's History

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/index.html b/content/index.html index 31e931920..1d07d9876 100644 --- a/content/index.html +++ b/content/index.html @@ -236,22 +236,23 @@

Apache CloudStack™

-

2016 CloudStack Collaboration Conferences

+

2017 CloudStack Collaboration Conferences

- In 2016, two Apache CloudStack Collaboration Conferences 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 CloudStack Collaboration Conference 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.

View videos from previous CloudStack Collaboration Conferences:

@@ -265,7 +266,7 @@

2016 CloudStack Collaboration Conferences

- +
@@ -355,7 +356,7 @@

2016 CloudStack Collaboration Conferences

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/mailing-lists.html b/content/mailing-lists.html index 94e21f17b..626e8b824 100644 --- a/content/mailing-lists.html +++ b/content/mailing-lists.html @@ -199,7 +199,7 @@

Conduct on Mailing Lists

-

Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+

Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
"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.

Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

diff --git a/content/security.html b/content/security.html index 1701ad4f4..a7950524c 100644 --- a/content/security.html +++ b/content/security.html @@ -182,12 +182,12 @@

Procedure for Res
  • CloudStack dev list
  • CloudStack users list
  • The Bugtraq mailing list - + </ul>
  • After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement.
  • Also after announcement, modify the Jira ticket so that the issue is now publicly viewable. - + </ul>
  • 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 @@

    Procedure for Res
    -

    Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    +

    Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    "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.

    Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

    diff --git a/content/software.html b/content/software.html index 97724fbc5..9e803d99c 100644 --- a/content/software.html +++ b/content/software.html @@ -174,7 +174,7 @@

    Download Now

    -

    Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    +

    Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    "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.

    Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

    diff --git a/content/survey.html b/content/survey.html index d73d943b5..525880f19 100644 --- a/content/survey.html +++ b/content/survey.html @@ -145,7 +145,7 @@

    Apache CloudStack Survey

    -

    Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    +

    Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    "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.

    Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

    diff --git a/content/trademark-guidelines.html b/content/trademark-guidelines.html index 5a2397d43..aaf601872 100644 --- a/content/trademark-guidelines.html +++ b/content/trademark-guidelines.html @@ -286,7 +286,7 @@

    Websites

    -

    Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    +

    Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    "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.

    Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

    diff --git a/content/users.html b/content/users.html index d5761deab..35185bcda 100644 --- a/content/users.html +++ b/content/users.html @@ -377,7 +377,7 @@

    Apache CloudStack Users

    -

    Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    +

    Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    "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.

    Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

    diff --git a/content/videos.html b/content/videos.html index a654cbe75..26776a276 100644 --- a/content/videos.html +++ b/content/videos.html @@ -150,7 +150,7 @@

    Apache CloudStack Architecture (P
    -

    Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    +

    Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    "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.

    Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

    diff --git a/content/who.html b/content/who.html index 1cd7ee5c1..8581a8e62 100644 --- a/content/who.html +++ b/content/who.html @@ -750,7 +750,7 @@

    Emeritus Committers

    -

    Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    +

    Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    "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.

    Apache CloudStack Trademark Usage - Apache CloudStack Community ByLaws

    From ff1b584f3cd721eebd33db17ae79631a0b768e18 Mon Sep 17 00:00:00 2001 From: Will Stevens Date: Fri, 27 Jan 2017 16:19:11 -0500 Subject: [PATCH 4/4] fixed some malformed html which was causing the security page to render incorrectly --- content/security.html | 61 ++++++++++++++++++++-------------------- source/security.markdown | 48 ++++++++++++++++--------------- 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/content/security.html b/content/security.html index a7950524c..4dde34ac2 100644 --- a/content/security.html +++ b/content/security.html @@ -162,38 +162,39 @@

    Reporting Pote

    Procedure for Responding to Potential Security Issues

      -
    • 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 -
    • Security team investigates the issue to confirm/deny the presence of a vulnerability within CloudStack -
    • If the issue is determined not to be a vulnerability the reporter will be notified and the issue will be closed as invalid -
    • If issue is confirmed as a CloudStack vulnerability: -
        -
      • Security team notifies the Apache Security team -
      • Security team assigns a risk rating to the vulnerability using the Common Vulnerability Scoring System -
      • 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 -
      • Security team works with Apache Security Team to reserve a CVE Identifier for future public release -
      • Security team works with appropriate code maintainer(s) to create patch to mitigate the issue -
      • Testing is conducted to verify patch mitigates issue and does not cause regression errors -
      • Security team creates a vulnerability announcement -
      • Patch is committed to trunk and other supported branches that are affected. The commit should not refer to a particular vulnerability -
      • A new CloudStack release or hotfix is prepared and tested, containing the new security patch -
      • Distributor coordination is implemented to enable a coordinated announcement -
      • Security team posts vulnerability announcement to... +
      • 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
        • +
      • Security team investigates the issue to confirm/deny the presence of a vulnerability within CloudStack
        • +
      • If the issue is determined not to be a vulnerability the reporter will be notified and the issue will be closed as invalid
        • +
      • If issue is confirmed as a CloudStack vulnerability:
          -
        • CloudStack dev list -
        • CloudStack users list -
        • The Bugtraq mailing list - </ul> -
        • After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement. -
        • Also after announcement, modify the Jira ticket so that the issue is now publicly viewable. - </ul> -
        • 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> +
        • Security team notifies the Apache Security team
          • +
        • Security team assigns a risk rating to the vulnerability using the Common Vulnerability Scoring System
          • +
        • 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
          • +
        • Security team works with Apache Security Team to reserve a CVE Identifier for future public release
          • +
        • Security team works with appropriate code maintainer(s) to create patch to mitigate the issue
          • +
        • Testing is conducted to verify patch mitigates issue and does not cause regression errors
          • +
        • Security team creates a vulnerability announcement
          • +
        • Patch is committed to trunk and other supported branches that are affected. The commit should not refer to a particular vulnerability
          • +
        • A new CloudStack release or hotfix is prepared and tested, containing the new security patch
          • +
        • Distributor coordination is implemented to enable a coordinated announcement
          • +
        • Security team posts vulnerability announcement to... +
            +
          • CloudStack dev list
            • +
          • CloudStack users list
            • +
          • The Bugtraq mailing list
            • +
          +
          • +
        • After announcement, CHANGES and NEWS files need to be updated to reflect the vulnerability and fix. This must happen AFTER the announcement.
          • +
        • Also after announcement, modify the Jira ticket so that the issue is now publicly viewable.
          • +
        +
        • +
      • 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.
        • +
      + +

      For further information

      + +

      Further information about Apache CloudStack's security practices can be found in the CloudStack Security wiki page.

      -## 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). - -