Merge pull request #2 from apache/master

Merge with official repos master branch

docs/frameworks.md

@@ -11,12 +11,15 @@ layout: documentation
 ## Long Running Services
 
 * [Aurora](http://aurora.apache.org) is a service scheduler that runs on top of Mesos, enabling you to run long-running services that take advantage of Mesos' scalability, fault-tolerance, and resource isolation.
+* [Compose](https://github.com/AVENTER-UG/mesos-compose) is a scheduler (HTTP API) for long running Mesos tasks. The syntax is compatible to docker-compose.
+* [M3s](https://github.com/AVENTER-UG/mesos-m3s) is a scheduler (HTTP API) to run multiple K3s (Kubernetes) cluster on top of Mesos.
 * [Marathon](https://github.com/mesosphere/marathon) is a private PaaS built on Mesos. It automatically handles hardware or software failures and ensures that an app is "always on".
 * [Singularity](https://github.com/HubSpot/Singularity) is a scheduler (HTTP API and web interface) for running Mesos tasks: long running processes, one-off tasks, and scheduled jobs.
 * [SSSP](https://github.com/mesosphere/sssp) is a simple web application that provides a white-label "Megaupload" for storing and sharing files in S3.
 
 ## Big Data Processing
 
+* [Apache Airflow provider](https://github.com/AVENTER-UG/airflow-provider-mesos) is a scheduler to scale out Apache Airflow DAG's on Mesos.
 * [Cray Chapel](https://github.com/nqn/mesos-chapel) is a productive parallel programming language. The Chapel Mesos scheduler lets you run Chapel programs on Mesos.
 * [Dpark](https://github.com/douban/dpark) is a Python clone of Spark, a MapReduce-like framework written in Python, running on Mesos.
 * [Exelixi](https://github.com/mesosphere/exelixi) is a distributed framework for running genetic algorithms at scale.
@@ -49,3 +52,8 @@ layout: documentation
 ## Machine Learning
 
 * [TFMesos](https://github.com/douban/tfmesos) is a lightweight framework to help running distributed [Tensorflow](https://www.tensorflow.org/) Machine Learning tasks on Apache Mesos with GPU support.
+
+## Load Balancing
+
+* [Traefik Mesos provider](https://github.com/AVENTER-UG/traefik-mesos) is a modern HTTP reverse proxy and load balancer with build-in TCP and UDP support.
+

site/Gemfile.lock

@@ -137,7 +137,7 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.2)
       tzinfo (>= 1.0.0)

site/source/blog/2015-01-14-mesoscon-2015-earlybird-registration-now-open.md

@@ -11,7 +11,7 @@ tags: MesosCon, Announcement
 
 A limited number of early-bird tickets are now available for [#MesosCon 2015](http://mesoscon.org), an annual conference organized by the Apache Mesos community. MesosCon brings together users and developers to share and learn about the project and its growing ecosystem, and will take place in Seattle, WA.
 
-<blockquote class="twitter-tweet" lang="en"><p>.<a href="https://twitter.com/mesoscon">@MesosCon</a> early-bird registration is now open to the first 140 attendees! Join us! <a href="http://t.co/LcIclfttgq">http://t.co/LcIclfttgq</a> More info: <a href="http://t.co/Dnd5XWhoOH">http://t.co/Dnd5XWhoOH</a></p>&mdash; Apache Mesos (@ApacheMesos) <a href="https://twitter.com/ApacheMesos/status/555445970595368960">January 14, 2015</a></blockquote> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<blockquote class="twitter-tweet" lang="en"><p>.<a href="https://twitter.com/mesoscon">@MesosCon</a> early-bird registration is now open to the first 140 attendees! Join us! <a href="http://t.co/LcIclfttgq">http://t.co/LcIclfttgq</a> More info: <a href="http://t.co/Dnd5XWhoOH">http://t.co/Dnd5XWhoOH</a></p>&mdash; Apache Mesos (@ApacheMesos) <a href="https://twitter.com/ApacheMesos/status/555445970595368960">January 14, 2015</a></blockquote>
 
 [Early-bird registration is open today](http://events.linuxfoundation.org/events/mesoscon/attend/register) to the first 140 attendees / through February 14th, 2015.
 

site/source/blog/2015-07-01-mesoscon-seattle-keynote-speakers-announced.md

@@ -12,7 +12,6 @@ tags: MesosCon
 The countdown until [#MesosCon](http://events.linuxfoundation.org/events/mesoscon) has begun:
 
 <blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr">Only 7 weeks until <a href="https://twitter.com/hashtag/MesosCon?src=hash">#MesosCon</a>! Register today and join us in Seattle <a href="http://t.co/bVJ9dL5CEO">http://t.co/bVJ9dL5CEO</a></p>&mdash; #MesosCon (@mesoscon) <a href="https://twitter.com/mesoscon/status/616320613922275332">July 1, 2015</a></blockquote>
-<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 
 MesosCon is an annual conference organized by the Apache Mesos community, bringing together users and developers to share and learn about the project and its growing ecosystem. [Register now](http://events.linuxfoundation.org/events/mesoscon/attend/register) and join us in Seattle this August!
 

site/source/community.html.md

@@ -44,16 +44,15 @@ layout: community_section
     <p>Thank you <a href="https://www.criteo.com">Criteo</a> for sponsoring Slack standard plan.</p>
 
 
-    <h3 name="ircchannel">IRC </h3>
-    <p> If you want to connect to our slack team through an IRC client please click <a href="https://my.slack.com/gateways">here</a> after signing up.</p>
+    <h3 name="ircchannel">IRC</h3>
+    <p>If you want to connect to our slack team through an IRC client please click <a href="https://my.slack.com/gateways">here</a> after signing up.</p>
 
-    <p>The slack channel is currently also mirrored at #mesos channel on irc.freenode.net.</p>
+    <p>The slack channel is currently also mirrored at #mesos channel on irc.freenode.net and at <a href="https://matrix.to/#/#mesos:matrix.aventer.biz">matrix</a>.</p>
 
     <p>If you are new to IRC, you can use a <a href="http://webchat.freenode.net/?channels=#mesos">web-based client</a>.</p>
 
     <h3 name="twitter">Follow us on Twitter</h3>
-    <a class="twitter-timeline" href="https://twitter.com/ApacheMesos" data-widget-id="426586952293289985">Tweets by @ApacheMesos</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>
+    <p><a href="https://twitter.com/ApacheMesos">@ApacheMesos</a></p>
 
   </div>
   <div class="col-md-12">

src/slave/slave.cpp

@@ -255,6 +255,8 @@ Slave::~Slave()
   // TODO(benh): Shut down executors? The executor should get an "exited"
   // event and initiate a shut down itself.
 
+  Clock::cancel(pingTimer);
+
   foreachvalue (Framework* framework, frameworks) {
     delete framework;
   }

support/mesos-website/Dockerfile

@@ -13,14 +13,16 @@ USER root
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
       doxygen \
-      locales \
-      ruby \
-      ruby-dev \
-      rubygems && \
+      locales && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN gem install bundler
+# Install ruby version manager to get a more updated ruby version                                
+RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - && \
+    curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - && \ 
+    curl -k -sSL https://get.rvm.io | bash -s stable --ruby=2.6.6 
+
+ENV PATH=/usr/local/rvm/rubies/ruby-2.6.6/bin:$PATH    
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8