You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2015/12/17 06:18:31 UTC

[1/3] mesos git commit: Updated Getting Started for Mac OS X El Capitan.

Repository: mesos
Updated Branches:
  refs/heads/master 5281049ac -> 492f1c62c


Updated Getting Started for Mac OS X El Capitan.

The instructions for El Capitan are identical to Yosemite, with one
caveat: if upgrading from Yosemite to El Capitan, you need to rerun
'xcode-select --install'. This commit adds a note of this.

Review: https://reviews.apache.org/r/41286/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a3562e66
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a3562e66
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a3562e66

Branch: refs/heads/master
Commit: a3562e6687b80a35789db89b7cc8a7ae82f9f487
Parents: 5281049
Author: Kevin Klues <kl...@gmail.com>
Authored: Thu Dec 17 06:13:47 2015 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Thu Dec 17 06:13:47 2015 +0100

----------------------------------------------------------------------
 docs/getting-started.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a3562e66/docs/getting-started.md
----------------------------------------------------------------------
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 0225c9d..1704daa 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -41,9 +41,9 @@ Following are the instructions for stock Ubuntu 14.04. If you are using a differ
         # Install other Mesos dependencies.
         $ sudo apt-get -y install build-essential python-dev python-boto libcurl4-nss-dev libsasl2-dev maven libapr1-dev libsvn-dev
 
-### Mac OS X Yosemite
+### Mac OS X Yosemite & El Capitan
 
-Following are the instructions for stock Mac OS X Yosemite. If you are using a different OS, please install the packages accordingly.
+Following are the instructions for stock Mac OS X Yosemite and El Capitan. If you are using a different OS, please install the packages accordingly.
 
         # Install Command Line Tools.
         $ xcode-select --install
@@ -54,6 +54,8 @@ Following are the instructions for stock Mac OS X Yosemite. If you are using a d
         # Install libraries.
         $ brew install autoconf automake libtool subversion maven
 
+*NOTE: When upgrading from Yosemite to El Capitan, make sure to rerun `xcode-select --install` after the upgrade.*
+
 ### CentOS 6.6
 
 Following are the instructions for stock CentOS 6.6. If you are using a different OS, please install the packages accordingly.


[3/3] mesos git commit: Aligned the code blocks in Getting Started better.

Posted by ti...@apache.org.
Aligned the code blocks in Getting Started better.

Now each line starts at the beginning of the left hand margin, so that
multiple lines can be copied without extra space at the beginning of
each line. This is important for multiline commands (e.g. printing
multi-line strings to a file) so they can easily be copy and pasted
without having to modify the lines.

Review: https://reviews.apache.org/r/41360/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/492f1c62
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/492f1c62
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/492f1c62

Branch: refs/heads/master
Commit: 492f1c62cf963b0134b5380148ffc30897eb751f
Parents: d520ded
Author: Kevin Klues <kl...@gmail.com>
Authored: Thu Dec 17 06:15:25 2015 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Thu Dec 17 06:15:25 2015 +0100

----------------------------------------------------------------------
 docs/getting-started.md | 198 +++++++++++++++++++++----------------------
 1 file changed, 99 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/492f1c62/docs/getting-started.md
----------------------------------------------------------------------
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 1704daa..9b0df2e 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -8,14 +8,14 @@ layout: documentation
 
 There are different ways you can get Mesos:
 
-1. Download the latest stable release from [Apache](http://mesos.apache.org/downloads/) (***Recommended***)
+1\. Download the latest stable release from [Apache](http://mesos.apache.org/downloads/) (***Recommended***)
 
-        $ wget http://www.apache.org/dist/mesos/0.24.0/mesos-0.24.0.tar.gz
-        $ tar -zxf mesos-0.24.0.tar.gz
+    $ wget http://www.apache.org/dist/mesos/0.24.0/mesos-0.24.0.tar.gz
+    $ tar -zxf mesos-0.24.0.tar.gz
 
-2. Clone the Mesos git [repository](https://git-wip-us.apache.org/repos/asf/mesos.git) (***Advanced Users Only***)
+2\. Clone the Mesos git [repository](https://git-wip-us.apache.org/repos/asf/mesos.git) (***Advanced Users Only***)
 
-        $ git clone https://git-wip-us.apache.org/repos/asf/mesos.git
+    $ git clone https://git-wip-us.apache.org/repos/asf/mesos.git
 
 ## System Requirements
 
@@ -29,30 +29,30 @@ Make sure your hostname is resolvable via DNS or via `/etc/hosts` to allow full
 
 Following are the instructions for stock Ubuntu 14.04. If you are using a different OS, please install the packages accordingly.
 
-        # Update the packages.
-        $ sudo apt-get update
+    # Update the packages.
+    $ sudo apt-get update
 
-        # Install the latest OpenJDK.
-        $ sudo apt-get install -y openjdk-7-jdk
+    # Install the latest OpenJDK.
+    $ sudo apt-get install -y openjdk-7-jdk
 
-        # Install autotools (Only necessary if building from git repository).
-        $ sudo apt-get install -y autoconf libtool
+    # Install autotools (Only necessary if building from git repository).
+    $ sudo apt-get install -y autoconf libtool
 
-        # Install other Mesos dependencies.
-        $ sudo apt-get -y install build-essential python-dev python-boto libcurl4-nss-dev libsasl2-dev maven libapr1-dev libsvn-dev
+    # Install other Mesos dependencies.
+    $ sudo apt-get -y install build-essential python-dev python-boto libcurl4-nss-dev libsasl2-dev maven libapr1-dev libsvn-dev
 
 ### Mac OS X Yosemite & El Capitan
 
 Following are the instructions for stock Mac OS X Yosemite and El Capitan. If you are using a different OS, please install the packages accordingly.
 
-        # Install Command Line Tools.
-        $ xcode-select --install
+    # Install Command Line Tools.
+    $ xcode-select --install
 
-        # Install Homebrew.
-        $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    # Install Homebrew.
+    $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
-        # Install libraries.
-        $ brew install autoconf automake libtool subversion maven
+    # Install libraries.
+    $ brew install autoconf automake libtool subversion maven
 
 *NOTE: When upgrading from Yosemite to El Capitan, make sure to rerun `xcode-select --install` after the upgrade.*
 
@@ -60,126 +60,126 @@ Following are the instructions for stock Mac OS X Yosemite and El Capitan. If yo
 
 Following are the instructions for stock CentOS 6.6. If you are using a different OS, please install the packages accordingly.
 
-        # Install a recent kernel for full support of process isolation.
-        $ sudo rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
-        $ sudo rpm -Uvh http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm
-        $ sudo yum --enablerepo=elrepo-kernel install -y kernel-lt
+    # Install a recent kernel for full support of process isolation.
+    $ sudo rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
+    $ sudo rpm -Uvh http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm
+    $ sudo yum --enablerepo=elrepo-kernel install -y kernel-lt
 
-        # Make the just installed kernel the one booted by default, and reboot.
-        $ sudo sed -i 's/default=1/default=0/g' /boot/grub/grub.conf
-        $ sudo reboot
+    # Make the just installed kernel the one booted by default, and reboot.
+    $ sudo sed -i 's/default=1/default=0/g' /boot/grub/grub.conf
+    $ sudo reboot
 
-        # Install a few utility tools. This also forces an update of `nss`,
-        # which is necessary for the Java bindings to build properly.
-        $ sudo yum install -y tar wget which nss
+    # Install a few utility tools. This also forces an update of `nss`,
+    # which is necessary for the Java bindings to build properly.
+    $ sudo yum install -y tar wget which nss
 
-        # 'Mesos > 0.21.0' requires a C++ compiler with full C++11 support,
-        # (e.g. GCC > 4.8) which is available via 'devtoolset-2'.
-        # Fetch the Scientific Linux CERN devtoolset repo file.
-        $ sudo wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
+    # 'Mesos > 0.21.0' requires a C++ compiler with full C++11 support,
+    # (e.g. GCC > 4.8) which is available via 'devtoolset-2'.
+    # Fetch the Scientific Linux CERN devtoolset repo file.
+    $ sudo wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
 
-        # Import the CERN GPG key.
-        $ sudo rpm --import http://linuxsoft.cern.ch/cern/centos/7/os/x86_64/RPM-GPG-KEY-cern
+    # Import the CERN GPG key.
+    $ sudo rpm --import http://linuxsoft.cern.ch/cern/centos/7/os/x86_64/RPM-GPG-KEY-cern
 
-        # Fetch the Apache Maven repo file.
-        $ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
+    # Fetch the Apache Maven repo file.
+    $ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
 
-        # 'Mesos > 0.21.0' requires 'subversion > 1.8' devel package, which is
-        # not available in the default repositories.
-        # Add the WANdisco SVN repo file: '/etc/yum.repos.d/wandisco-svn.repo' with content:
+    # 'Mesos > 0.21.0' requires 'subversion > 1.8' devel package, which is
+    # not available in the default repositories.
+    # Add the WANdisco SVN repo file: '/etc/yum.repos.d/wandisco-svn.repo' with content:
 
-          [WANdiscoSVN]
-          name=WANdisco SVN Repo 1.8
-          enabled=1
-          baseurl=http://opensource.wandisco.com/centos/6/svn-1.8/RPMS/$basearch/
-          gpgcheck=1
-          gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
+      [WANdiscoSVN]
+      name=WANdisco SVN Repo 1.8
+      enabled=1
+      baseurl=http://opensource.wandisco.com/centos/6/svn-1.8/RPMS/$basearch/
+      gpgcheck=1
+      gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
 
-        # Install essential development tools.
-        $ sudo yum groupinstall -y "Development Tools"
+    # Install essential development tools.
+    $ sudo yum groupinstall -y "Development Tools"
 
-        # Install 'devtoolset-2-toolchain' which includes GCC 4.8.2 and related packages.
-        $ sudo yum install -y devtoolset-2-toolchain
+    # Install 'devtoolset-2-toolchain' which includes GCC 4.8.2 and related packages.
+    $ sudo yum install -y devtoolset-2-toolchain
 
-        # Install other Mesos dependencies.
-        $ sudo yum install -y apache-maven python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
+    # Install other Mesos dependencies.
+    $ sudo yum install -y apache-maven python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
 
-        # Enter a shell with 'devtoolset-2' enabled.
-        $ scl enable devtoolset-2 bash
-        $ g++ --version  # Make sure you've got GCC > 4.8!
+    # Enter a shell with 'devtoolset-2' enabled.
+    $ scl enable devtoolset-2 bash
+    $ g++ --version  # Make sure you've got GCC > 4.8!
 
 ### CentOS 7.1
 
 Following are the instructions for stock CentOS 7.1. If you are using a different OS, please install the packages accordingly.
 
-        # Install a few utility tools
-        $ sudo yum install -y tar wget
+    # Install a few utility tools
+    $ sudo yum install -y tar wget
 
-        # Fetch the Apache Maven repo file.
-        $ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
+    # Fetch the Apache Maven repo file.
+    $ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
 
-        # 'Mesos > 0.21.0' requires 'subversion > 1.8' devel package, which is
-        # not available in the default repositories.
-        # Add the WANdisco SVN repo file: '/etc/yum.repos.d/wandisco-svn.repo' with content:
+    # 'Mesos > 0.21.0' requires 'subversion > 1.8' devel package, which is
+    # not available in the default repositories.
+    # Add the WANdisco SVN repo file: '/etc/yum.repos.d/wandisco-svn.repo' with content:
 
-          [WANdiscoSVN]
-          name=WANdisco SVN Repo 1.9
-          enabled=1
-          baseurl=http://opensource.wandisco.com/centos/7/svn-1.9/RPMS/$basearch/
-          gpgcheck=1
-          gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
+      [WANdiscoSVN]
+      name=WANdisco SVN Repo 1.9
+      enabled=1
+      baseurl=http://opensource.wandisco.com/centos/7/svn-1.9/RPMS/$basearch/
+      gpgcheck=1
+      gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
 
-        # Install essential development tools.
-        $ sudo yum groupinstall -y "Development Tools"
+    # Install essential development tools.
+    $ sudo yum groupinstall -y "Development Tools"
 
-        # Install other Mesos dependencies.
-        $ sudo yum install -y apache-maven python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
+    # Install other Mesos dependencies.
+    $ sudo yum install -y apache-maven python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
 
 ## Building Mesos
 
-        # Change working directory.
-        $ cd mesos
+    # Change working directory.
+    $ cd mesos
 
-        # Bootstrap (Only required if building from git repository).
-        $ ./bootstrap
+    # Bootstrap (Only required if building from git repository).
+    $ ./bootstrap
 
-        # Configure and build.
-        $ mkdir build
-        $ cd build
-        $ ../configure
-        $ make
+    # Configure and build.
+    $ mkdir build
+    $ cd build
+    $ ../configure
+    $ make
 
 In order to speed up the build and reduce verbosity of the logs, you can append `-j <number of cores> V=0` to `make`.
 
-        # Run test suite.
-        $ make check
+    # Run test suite.
+    $ make check
 
-        # Install (Optional).
-        $ make install
+    # Install (Optional).
+    $ make install
 
 ## Examples
 
 Mesos comes bundled with example frameworks written in C++, Java and Python.
 
-        # Change into build directory.
-        $ cd build
+    # Change into build directory.
+    $ cd build
 
-        # Start mesos master (Ensure work directory exists and has proper permissions).
-        $ ./bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/var/lib/mesos
+    # Start mesos master (Ensure work directory exists and has proper permissions).
+    $ ./bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/var/lib/mesos
 
-        # Start mesos slave.
-        $ ./bin/mesos-slave.sh --master=127.0.0.1:5050
+    # Start mesos slave.
+    $ ./bin/mesos-slave.sh --master=127.0.0.1:5050
 
-        # Visit the mesos web page.
-        $ http://127.0.0.1:5050
+    # Visit the mesos web page.
+    $ http://127.0.0.1:5050
 
-        # Run C++ framework (Exits after successfully running some tasks.).
-        $ ./src/test-framework --master=127.0.0.1:5050
+    # Run C++ framework (Exits after successfully running some tasks.).
+    $ ./src/test-framework --master=127.0.0.1:5050
 
-        # Run Java framework (Exits after successfully running some tasks.).
-        $ ./src/examples/java/test-framework 127.0.0.1:5050
+    # Run Java framework (Exits after successfully running some tasks.).
+    $ ./src/examples/java/test-framework 127.0.0.1:5050
 
-        # Run Python framework (Exits after successfully running some tasks.).
-        $ ./src/examples/python/test-framework 127.0.0.1:5050
+    # Run Python framework (Exits after successfully running some tasks.).
+    $ ./src/examples/python/test-framework 127.0.0.1:5050
 
 *NOTE: To build the example frameworks, make sure you build the test suite by doing `make check`.*


[2/3] mesos git commit: [site] Forced horizontal scroll in docs code blocks.

Posted by ti...@apache.org.
[site] Forced horizontal scroll in docs code blocks.

Previously, we just wrapped the text and it was a mess. Now a horizontal
scroll bar will appear in code blocks instead of wrapping lines and
causing weirdness when trying to follow what's going on in the code.
It also makes it easier to copy and paste whole blocks of code.

Review: https://reviews.apache.org/r/41359/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d520dede
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d520dede
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d520dede

Branch: refs/heads/master
Commit: d520dede929c29a6297fc949e31973641878ec9b
Parents: a3562e6
Author: Kevin Klues <kl...@gmail.com>
Authored: Thu Dec 17 06:14:16 2015 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Thu Dec 17 06:14:16 2015 +0100

----------------------------------------------------------------------
 site/source/assets/css/main.css | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/d520dede/site/source/assets/css/main.css
----------------------------------------------------------------------
diff --git a/site/source/assets/css/main.css b/site/source/assets/css/main.css
index f5622cf..73ca894 100755
--- a/site/source/assets/css/main.css
+++ b/site/source/assets/css/main.css
@@ -11,6 +11,15 @@ ul.breadcrumb {
 	width: 940px;
 }
 
+pre {
+    overflow-x: auto;
+}
+
+pre code {
+    word-wrap: normal;
+    white-space: pre;
+}
+
 /* Custom container */
 .container > hr {
   margin: 20px 0;