Merge branch 'master' of https://github.com/apache/cloudstack-www
diff --git a/data/acs-events.csv b/data/acs-events.csv
index 38bdcb6..7f52326 100644
--- a/data/acs-events.csv
+++ b/data/acs-events.csv
@@ -1,5 +1,4 @@
Title,Link,Location,Date
-April CloudStack Meetup (Germany),https://www.meetup.com/de-DE/german-CloudStack-user-group/events/259269366/,Sankt Augustin (Bonn),11th April
-CloudStack Collaboration Conference Brazil,http://br.cloudstackcollab.org/,Florianopolis,26th April
CloudStack European User Group meetup,https://www.eventbrite.co.uk/e/cloudstack-european-user-group-meetup-tickets-55911193886,Sofia,13th June
CloudStack Collaboration Conference North America,http://us.cloudstackcollab.org/,Las Vegas,9th - 11th September
+CloudStack European User Group & Ceph Day,TBC,London,24th October
diff --git a/data/cloudstack.yml b/data/cloudstack.yml
index 35be717..5fc6654 100644
--- a/data/cloudstack.yml
+++ b/data/cloudstack.yml
@@ -3,13 +3,14 @@
main_islts:
main_docs_url: http://docs.cloudstack.apache.org/en/4.12.0.0/
branch: 4.12
- lts: 4.11.2.0
+ lts: 4.11.3.0
lts_docs_url: http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/4.11/
ltsbranch: 4.11
archives:
- '4.12':
- 4.12.0.0
- '4.11':
+ - 4.11.3.0
- 4.11.2.0
- 4.11.1.0
- 4.11.0.0
diff --git a/source/users.html.markdown b/source/users.html.markdown
index 64a7cd9..8e12cca 100644
--- a/source/users.html.markdown
+++ b/source/users.html.markdown
@@ -22,11 +22,11 @@
## How to Add your Company in The List
-If you are using CloudStack in your organisation and your company is not listed here, please send a pull request to the GitHub [page](https://github.com/apache/cloudstack-www/blob/master/source/users.markdown).
+If you are using CloudStack in your organisation and your company is not listed here, please send a pull request to the GitHub [page](https://github.com/apache/cloudstack-www/blob/master/source/users.html.markdown).
## How to Request the Entry Removal or Change
-If you noticed something wrong with your entry here (or if you’d like us to remove it), please send a pull request to the GitHub [page](https://github.com/apache/cloudstack-www/blob/master/source/users.markdown) or write your concerns to the mail-list **users@cloudstack.apache.org**.
+If you noticed something wrong with your entry here (or if you’d like us to remove it), please send a pull request to the GitHub [page](https://github.com/apache/cloudstack-www/blob/master/source/users.html.markdown) or write your concerns to the mail-list **users@cloudstack.apache.org**.
* [ActOnMagic](http://www.actonmagic.com)
* [Appcore](http://www.appcore.com)
@@ -64,6 +64,7 @@
* [SafeSwiss Cloud](https://www.safeswisscloud.ch)
* [HIAG Data AG](https://www.hiagdata.com)
* [SJC Inc](http://www.sjcloud.cn/index.xhtml)
+* [Server24](https://www.server24.eu)
* [Telia Latvia](http://www.telia.lv)
* [Tranquil Hosting](http://www.tqhosting.com)
* [Treestle BV](http://www.liquidns.com)
diff --git a/source/who.html.markdown b/source/who.html.markdown
index 2f320d3..bc10c5e 100644
--- a/source/who.html.markdown
+++ b/source/who.html.markdown
@@ -30,7 +30,9 @@
|akarasulu|Alex Karasulu|
|alena1108|Alena Prokharchyk|
|animesh|Animesh|
+|andrijapanic|Andrija Panic|
|boris|Boris Schrijver|
+|bstoyanov|Boris Stoyanov|
|chipchilders|Chip Childers|
|chiradeep|Chiradeep Vittal|
|dahn|Daan|
@@ -38,6 +40,7 @@
|erikw|Erik Weber|
|giles|Giles Sirett|
|gochiba|Go Chiba|
+|gabriel|Gabriel Beims Bräscher|
|hogstrom|Matt Richard Hogstrom|
|hugo|Hugo Trippaers|
|ilya|Ilya Musayev|
@@ -54,6 +57,7 @@
|mtutkowski|Mike Tutkowski|
|nslater|Naomi Slater|
|nux|Nux|
+|nathanejohnson|Nathan Johnson|
|paul_a|Paul Angus|
|pdion891|Pierre-Luc Dion|
|rafael|Rafael Weingärtner|
@@ -65,6 +69,7 @@
|sweller|Simon Weller|
|swill|Will Stevens|
|syed|Syed Ahmed|
+|svogel|Sven Vogel|
|tsp|Prasanna|
|weizhou|Wei Zhou|
|widodh|Wido den Hollander|
