From b12096bd6c5252ff215572028b8088757bd38e32 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 22 Feb 2016 13:23:29 +0000
Subject: [PATCH 1/3] tweak

---
 site/plugin.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/plugin.md b/site/plugin.md
index fcd336ef..f9cd005f 100644
--- a/site/plugin.md
+++ b/site/plugin.md
@@ -18,12 +18,12 @@ Subsequently you can start containers with, e.g.
 
 on any of the hosts, and they can all communicate with each other.
 
-> NB: It is inadvisable to attach containers to the weave network
+> WARNING: It is inadvisable to attach containers to the weave network
 > using both the Weave Docker Networking Plugin and
 > [Weave Docker API Proxy](proxy.html) simultaneously. Such containers
 > will end up with two weave network interfaces and two IP addresses,
-> which is rarely desirable. To ensure the proxy is not being used, *do
-> not run `eval $(weave env)`, or `docker $(weave config) ...`*.
+> which is rarely desirable. To ensure the proxy is not being used,
+> *do not run `eval $(weave env)`, or `docker $(weave config) ...`*.
 
 In order to use Weave's [Service Discovery](weavedns.html), you
 need to pass the additional arguments `--dns` and `-dns-search`, for

From 12d848162d11f145151c864e0ca73730050f1e17 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sat, 9 Jan 2016 14:01:27 +0000
Subject: [PATCH 2/3] shrink Travis usage

There is no point running builds, tests, lints on Travis, since we
already do that on Circle.

The only thing we aren't doing (and can't do) on Circle is doc
publishing, so now Travis does just that.

(cherry picked from commit 1038cbd1a3629fb2c9a2571d59b066800b2d2e20)
---
 .travis.yml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0439e89b..4938c760 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,12 @@
 language: go
 sudo: false
-go:
-  - 1.4
 
 env:
   - PATH="${PATH}:${HOME}/.local/bin"
 
-addons:
-  apt:
-    packages:
-    - libpcap-dev
-
 install:
-  - go clean -i net
-  - go install -tags netgo std
-  - go get github.com/golang/lint/golint
   - pip install --user --upgrade gsutil
   - bin/setup-ci-secrets $encrypted_5ba036e89377_key $encrypted_5ba036e89377_iv
-  - make travis
-  - go get ./...
 
 script:
-  - make tests
-
-after_success:
-  - go get github.com/mattn/goveralls
-  - test "${TRAVIS_PULL_REQUEST}" = "false" && site/build-and-publish.sh
+  - 'test "${TRAVIS_PULL_REQUEST}" = "false" && site/build-and-publish.sh || true'

From c8ae128e596d086ecc1530332b342a831aabea32 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sat, 9 Jan 2016 14:06:45 +0000
Subject: [PATCH 3/3] for Travis, this no longer is a go project

Travis insists that one picks a project language. There is no go left
in the steps executed by travis. Instead we have Python, Ruby and
shell. Let's pick the first...

Picking Python makes travis unhappy with "Can not perform a '--user'
install. User site-packages are not visible in this
virtualenv". Dropping the '--user' flag fixes that.

(cherry picked from commit 1d8d098450b6b7d5d0e2755db0b9019c78bf837c)
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4938c760..5e23cac7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
-language: go
+language: python
 sudo: false
 
 env:
   - PATH="${PATH}:${HOME}/.local/bin"
 
 install:
-  - pip install --user --upgrade gsutil
+  - pip install --upgrade gsutil
   - bin/setup-ci-secrets $encrypted_5ba036e89377_key $encrypted_5ba036e89377_iv
 
 script: