Repository: aurora Updated Branches: refs/heads/master d8e948bed -> f202f2d28
Use zookeeperd package in vagrant. Reviewed at https://reviews.apache.org/r/37740/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/f202f2d2 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/f202f2d2 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/f202f2d2 Branch: refs/heads/master Commit: f202f2d288badb3720fb2413825defcfd7b4fe42 Parents: d8e948b Author: Bill Farner <[email protected]> Authored: Mon Aug 24 17:58:48 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Mon Aug 24 17:58:48 2015 -0700 ---------------------------------------------------------------------- examples/vagrant/provision-dev-cluster.sh | 2 +- examples/vagrant/upstart/zookeeper.conf | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/f202f2d2/examples/vagrant/provision-dev-cluster.sh ---------------------------------------------------------------------- diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh index 16ae8d1..4474543 100755 --- a/examples/vagrant/provision-dev-cluster.sh +++ b/examples/vagrant/provision-dev-cluster.sh @@ -28,7 +28,7 @@ apt-get -y install \ lxc-docker \ openjdk-8-jdk \ python-dev \ - zookeeper + zookeeperd update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java http://git-wip-us.apache.org/repos/asf/aurora/blob/f202f2d2/examples/vagrant/upstart/zookeeper.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/zookeeper.conf b/examples/vagrant/upstart/zookeeper.conf deleted file mode 100644 index fbc0a79..0000000 --- a/examples/vagrant/upstart/zookeeper.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -description "zookeeper" -start on stopped rc RUNLEVEL=[2345] -respawn -post-stop exec sleep 5 - -env JVMFLAGS='-Djava.net.preferIPv4Stack=true' - -exec /usr/share/zookeeper/bin/zkServer.sh start-foreground
