Merge branch 'master' into build-go-verbose

.travis.yml

@@ -15,8 +15,8 @@ install:
 
 script:
   - ./hack/test-go.sh
-  - PATH=$HOME/gopath/bin:$PATH ./hack/test-cmd.sh
-  - PATH=$HOME/gopath/bin:$HOME/etcd/bin:$PATH ./hack/test-integration.sh
+  - PATH=$HOME/gopath/bin:./third_party/etcd/bin:$PATH ./hack/test-cmd.sh
+  - PATH=$HOME/gopath/bin:./third_party/etcd/bin:$PATH ./hack/test-integration.sh
 
 notifications:
   irc: "chat.freenode.net#google-containers"

cluster/saltbase/salt/etcd/init.sls

@@ -4,9 +4,9 @@ etcd-install:
     - name: git://github.com/coreos/etcd
   cmd.wait:
     - cwd: /var/src/etcd
-    - names:
-      - git checkout ab4bcc18694644d12f0c038339d8d039072502b1  
-      - ./build
+    - name: |
+        git checkout ab4bcc18694644d12f0c038339d8d039072502b1  
+        ./build
     - env:
       - PATH: {{ grains['path'] }}:/usr/local/bin
     - watch:

hack/install-etcd.sh

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cd third_party
 git clone https://github.com/coreos/etcd.git
 cd etcd
 git checkout ab4bcc18694644d12f0c038339d8d039072502b1 

hack/test-go.sh

@@ -46,11 +46,12 @@ find_test_pkgs() {
 
 # there is currently a race in the coverage code in tip.  Remove this when it is fixed
 # see https://code.google.com/p/go/issues/detail?id=8630 for details.
-if [[ "${TRAVIS_GO_VERSION}" -eq "tip" ]]; then
+if [ "${TRAVIS_GO_VERSION}" == "tip" ]; then
   KUBE_COVER=""
+else
+  # -covermode=atomic becomes default with -race in Go >=1.3
+  KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
 fi
-# -covermode=atomic becomes default with -race in Go >=1.3
-KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}
 
 cd "${KUBE_TARGET}"

hack/verify-boilerplate.sh

@@ -18,7 +18,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../" && pwd -P)"
 
 result=0
 
-gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|_?output/|target/")"
+gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|_?output/|target/")" 
 for file in ${gofiles}; do
   if [[ "$(${REPO_ROOT}/hooks/boilerplate.sh "${file}")" -eq "0" ]]; then
     echo "Boilerplate header is wrong for: ${file}"