diff --git a/doc/GettingStarted.md b/doc/GettingStarted.md index 184b08aa186..f590371022f 100644 --- a/doc/GettingStarted.md +++ b/doc/GettingStarted.md @@ -115,7 +115,6 @@ sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - python-mysqldb - libssl-dev - g++ - - mercurial - git - pkg-config - bison @@ -125,7 +124,7 @@ sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES These can be installed with the following apt-get command: ``` sh - $ sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ mercurial git pkg-config bison curl unzip + $ sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ git pkg-config bison curl unzip ``` 5. If you decided to use ZooKeeper in step 3, you also need to install a @@ -161,7 +160,7 @@ sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES 5. Run the following commands: ``` sh - brew install go automake libtool python mercurial git bison curl wget homebrew/versions/mysql56 + brew install go automake libtool python git bison curl wget homebrew/versions/mysql56 pip install --upgrade pip setuptools pip install virtualenv pip install MySQL-python diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common index 128142be6f8..708667576d5 100644 --- a/docker/bootstrap/Dockerfile.common +++ b/docker/bootstrap/Dockerfile.common @@ -13,7 +13,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins libssl-dev \ libtool \ make \ - mercurial \ openjdk-7-jdk \ php-pear \ php5-cli \ diff --git a/docs/getting-started/local-instance.html b/docs/getting-started/local-instance.html index aeab49d973a..d29512af3e2 100644 --- a/docs/getting-started/local-instance.html +++ b/docs/getting-started/local-instance.html @@ -417,7 +417,6 @@

Ubuntu and Debian

  • python-mysqldb
  • libssl-dev
  • g++
  • -
  • mercurial
  • git
  • pkg-config
  • bison
  • @@ -426,7 +425,7 @@

    Ubuntu and Debian

    These can be installed with the following apt-get command:

    -
    $ sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ mercurial git pkg-config bison curl unzip
    +
    $ sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ git pkg-config bison curl unzip
     
  • If you decided to use ZooKeeper in step 3, you also need to install a Java Runtime, such as OpenJDK.

    @@ -451,7 +450,7 @@

    OS X

  • ZooKeeper is used as lock service.

  • Run the following commands:

    -
    brew install go automake libtool python mercurial git bison curl wget homebrew/versions/mysql56
    +
    brew install go automake libtool python git bison curl wget homebrew/versions/mysql56
     pip install --upgrade pip setuptools
     pip install virtualenv
     pip install MySQL-python