Files
kubernetes/cluster
Kubernetes Submit Queue af8124c7bf Merge pull request #31609 from rhcarvalho/fix-bash
Automatic merge from submit-queue

Fix Bash script

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**: `cluster/mesos/docker/socat/build.sh` had two lines mixed together.

Old command output:

```
$ ./cluster/mesos/docker/socat/build.sh 
./cluster/mesos/docker/socat/build.sh: line 21: set: pipefailscript_dir=/home/rodolfo/src/k8s.io/kubernetes/cluster/mesos/docker/socat: invalid option name
```

**Special notes for your reviewer**: probably nobody is using that script? @sttts PTAL.

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
NONE
```
2016-09-05 18:10:24 -07:00
..
2016-08-29 19:12:16 -07:00
2016-08-14 22:12:51 +03:00
2016-09-02 16:57:07 -05:00
2016-08-29 14:01:44 +02:00
2016-08-25 17:34:41 -07:00
2016-07-12 21:52:54 -07:00

Cluster Configuration

Deprecation Notice: This directory has entered maintainence mode and will not be accepting new providers. Please submit new automation deployments to kube-deploy. Deployments in this directory will continue to be maintained and supported at their current level of support.

The scripts and data in this directory automate creation and configuration of a Kubernetes cluster, including networking, DNS, nodes, and master components.

See the getting-started guides for examples of how to use the scripts.

cloudprovider/config-default.sh contains a set of tweakable definitions/parameters for the cluster.

The heavy lifting of configuring the VMs is done by SaltStack.

Analytics