From 8a82f368d02b6e71260bedee79f51e46e2cd7b5f Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 8 Apr 2015 16:35:52 +0100 Subject: [PATCH] Update repository name from zettio to weaveworks --- CHANGELOG.md | 8 ++++---- README.md | 6 +++--- Vagrantfile | 4 ++-- bin/merge-into-gh-pages | 4 ++-- bin/publish-gh-pages | 2 +- build/build.sh | 6 +++--- common/updater/updater.go | 2 +- nameserver/cache.go | 2 +- nameserver/cache_test.go | 4 ++-- nameserver/http.go | 2 +- nameserver/http_test.go | 2 +- nameserver/mdns_client_test.go | 4 ++-- nameserver/mdns_lookup.go | 2 +- nameserver/mdns_server.go | 2 +- nameserver/mdns_server_test.go | 4 ++-- nameserver/server.go | 2 +- nameserver/server_test.go | 4 ++-- nameserver/zone.go | 2 +- nameserver/zone_test.go | 2 +- router/gossip_test.go | 2 +- router/mocks_test.go | 2 +- router/peers_test.go | 2 +- site/_layouts/default.html | 2 +- site/building.md | 22 +++++++++++----------- site/features.md | 2 +- site/how-it-works.md | 2 +- site/index.md | 4 ++-- site/systemd.md | 2 +- site/troubleshooting.md | 6 +++--- weavedns/README.md | 2 +- weavedns/main.go | 8 ++++---- weaver/main.go | 4 ++-- 32 files changed, 62 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 713c7177..a2c9cf97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ required for weave operation. See the -[complete change log](https://github.com/zettio/weave/issues?q=milestone%3A0.9.0) +[complete change log](https://github.com/weaveworks/weave/issues?q=milestone%3A0.9.0) for more details. ## Release 0.8.0 @@ -39,9 +39,9 @@ This is the first release assigned a version number. When downloading weave you now have the following choices... -1. a specific version, e.g. https://github.com/zettio/weave/releases/download/v0.7.0/weave -2. latest released version: https://github.com/zettio/weave/releases/download/latest_release/weave -3. most recent 'master' commit: https://raw.githubusercontent.com/zettio/weave/master/weave +1. a specific version, e.g. https://github.com/weaveworks/weave/releases/download/v0.7.0/weave +2. latest released version: https://github.com/weaveworks/weave/releases/download/latest_release/weave +3. most recent 'master' commit: https://raw.githubusercontent.com/weaveworks/weave/master/weave Previously the only documented download location was (3). We recommend that any automated scripts using that be changed to either (1) or (2). diff --git a/README.md b/README.md index 351be1f5..ac99a22c 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Ensure you are running Linux (kernel 3.5 or later) and have Docker (version 0.9.1 or later) installed. Then install weave with sudo wget -O /usr/local/bin/weave \ - https://github.com/zettio/weave/releases/download/latest_release/weave + https://github.com/weaveworks/weave/releases/download/latest_release/weave sudo chmod a+x /usr/local/bin/weave CoreOS users see [here](https://github.com/fintanr/weave-gs/blob/master/coreos-simple/user-data) for an example of installing weave using cloud-config. @@ -135,12 +135,12 @@ to each other. * [Troubleshooting](http://zettio.github.io/weave/troubleshooting.html) * [Building](http://zettio.github.io/weave/building.html) * [How it works](http://zettio.github.io/weave/how-it-works.html) - * [WeaveDNS README](https://github.com/zettio/weave/tree/master/weavedns#readme) + * [WeaveDNS README](https://github.com/weaveworks/weave/tree/master/weavedns#readme) ## Contact Us Found a bug, want to suggest a feature, or have a question? -[File an issue](https://github.com/zettio/weave/issues), or email +[File an issue](https://github.com/weaveworks/weave/issues), or email help@weave.works. When reporting a bug, please include which version of weave you are running, as shown by `weave version`. diff --git a/Vagrantfile b/Vagrantfile index f9d4c393..87c23060 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -15,8 +15,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.synced_folder ".", "/home/vagrant/src/github.com/zettio/weave" - config.vm.provision :shell, :inline => "ln -s /home/vagrant/src/github.com/zettio/weave /home/vagrant/weave" + config.vm.synced_folder ".", "/home/vagrant/src/github.com/weaveworks/weave" + config.vm.provision :shell, :inline => "ln -s /home/vagrant/src/github.com/weaveworks/weave /home/vagrant/weave" config.vm.provision :shell, :inline => "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9" config.vm.provision :shell, :inline => "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list" diff --git a/bin/merge-into-gh-pages b/bin/merge-into-gh-pages index a664b636..810fd3fd 100755 --- a/bin/merge-into-gh-pages +++ b/bin/merge-into-gh-pages @@ -2,7 +2,7 @@ set -e # For info on why/how to use this script, see -# https://github.com/zettio/weave/wiki/WorkingOnWeave#working-on-docs +# https://github.com/weaveworks/weave/wiki/WorkingOnWeave#working-on-docs MERGE_ARGS="-X subtree=site" @@ -10,7 +10,7 @@ merge_dir=$(mktemp -d -t weave-merge.XXXXXX)/weave git clone -b gh-pages . $merge_dir pushd $merge_dir -git pull --ff-only git@github.com:zettio/weave gh-pages +git pull --ff-only git@github.com:weaveworks/weave gh-pages git fetch origin master git merge $MERGE_ARGS -e -m "Merge master into gh-pages" origin/master diff --git a/bin/publish-gh-pages b/bin/publish-gh-pages index f31728b5..95622740 100755 --- a/bin/publish-gh-pages +++ b/bin/publish-gh-pages @@ -1,3 +1,3 @@ #! /bin/sh set -e -git push git@github.com:zettio/weave gh-pages:gh-pages +git push git@github.com:weaveworks/weave gh-pages:gh-pages diff --git a/build/build.sh b/build/build.sh index 68523397..3863d97d 100644 --- a/build/build.sh +++ b/build/build.sh @@ -4,7 +4,7 @@ set -e GOPATH=/home/go export GOPATH -WEAVE_SRC=$GOPATH/src/github.com/zettio/weave +WEAVE_SRC=$GOPATH/src/github.com/weaveworks/weave if [ $# -eq 0 ] ; then # No arguments. Expect that the weave repo will be bind-mounted @@ -16,12 +16,12 @@ either bind-mount the golang workspace containing weave with the docker run -v option, e.g.: $ docker run -v :${GOPATH} \\ - -v /var/run/docker.sock:/var/run/docker.sock zettio/weave-build + -v /var/run/docker.sock:/var/run/docker.sock weaveworks/weave-build Or supply git clone arguments to retrieve it, e.g.: $ docker run -v /var/run/docker.sock:/var/run/docker.sock \\ - zettio/weave-build https://github.com/zettio/weave.git + weaveworks/weave-build https://github.com/weaveworks/weave.git EOF exit 1 fi diff --git a/common/updater/updater.go b/common/updater/updater.go index f46944cb..f46a0dea 100644 --- a/common/updater/updater.go +++ b/common/updater/updater.go @@ -2,7 +2,7 @@ package updater import ( "github.com/fsouza/go-dockerclient" - . "github.com/zettio/weave/common" + . "github.com/weaveworks/weave/common" ) type ContainerObserver interface { diff --git a/nameserver/cache.go b/nameserver/cache.go index fc7db41c..2051f37e 100644 --- a/nameserver/cache.go +++ b/nameserver/cache.go @@ -4,7 +4,7 @@ import ( "container/heap" "errors" "github.com/miekg/dns" - . "github.com/zettio/weave/common" + . "github.com/weaveworks/weave/common" "math" "math/rand" "sync" diff --git a/nameserver/cache_test.go b/nameserver/cache_test.go index bccb8d32..65456634 100644 --- a/nameserver/cache_test.go +++ b/nameserver/cache_test.go @@ -3,8 +3,8 @@ package nameserver import ( "fmt" "github.com/miekg/dns" - . "github.com/zettio/weave/common" - wt "github.com/zettio/weave/testing" + . "github.com/weaveworks/weave/common" + wt "github.com/weaveworks/weave/testing" "net" "testing" "time" diff --git a/nameserver/http.go b/nameserver/http.go index db15275e..56a8173d 100644 --- a/nameserver/http.go +++ b/nameserver/http.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/gorilla/mux" "github.com/miekg/dns" - . "github.com/zettio/weave/common" + . "github.com/weaveworks/weave/common" "io" "log" "net" diff --git a/nameserver/http_test.go b/nameserver/http_test.go index 196c8447..0c20de9d 100644 --- a/nameserver/http_test.go +++ b/nameserver/http_test.go @@ -2,7 +2,7 @@ package nameserver import ( "fmt" - wt "github.com/zettio/weave/testing" + wt "github.com/weaveworks/weave/testing" "math/rand" "net" "net/http" diff --git a/nameserver/mdns_client_test.go b/nameserver/mdns_client_test.go index de6abd08..4a851230 100644 --- a/nameserver/mdns_client_test.go +++ b/nameserver/mdns_client_test.go @@ -2,8 +2,8 @@ package nameserver import ( "github.com/miekg/dns" - . "github.com/zettio/weave/common" - wt "github.com/zettio/weave/testing" + . "github.com/weaveworks/weave/common" + wt "github.com/weaveworks/weave/testing" "log" "net" "testing" diff --git a/nameserver/mdns_lookup.go b/nameserver/mdns_lookup.go index ddfb022e..46d9597f 100644 --- a/nameserver/mdns_lookup.go +++ b/nameserver/mdns_lookup.go @@ -2,7 +2,7 @@ package nameserver import ( "github.com/miekg/dns" - . "github.com/zettio/weave/common" + . "github.com/weaveworks/weave/common" "net" ) diff --git a/nameserver/mdns_server.go b/nameserver/mdns_server.go index c0ba917e..54da5740 100644 --- a/nameserver/mdns_server.go +++ b/nameserver/mdns_server.go @@ -2,7 +2,7 @@ package nameserver import ( "github.com/miekg/dns" - . "github.com/zettio/weave/common" + . "github.com/weaveworks/weave/common" "net" ) diff --git a/nameserver/mdns_server_test.go b/nameserver/mdns_server_test.go index e7b2a92b..b34cb80e 100644 --- a/nameserver/mdns_server_test.go +++ b/nameserver/mdns_server_test.go @@ -2,8 +2,8 @@ package nameserver import ( "github.com/miekg/dns" - "github.com/zettio/weave/common" - wt "github.com/zettio/weave/testing" + "github.com/weaveworks/weave/common" + wt "github.com/weaveworks/weave/testing" "log" "net" "testing" diff --git a/nameserver/server.go b/nameserver/server.go index f0b52479..8033d48c 100644 --- a/nameserver/server.go +++ b/nameserver/server.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" "github.com/miekg/dns" - . "github.com/zettio/weave/common" + . "github.com/weaveworks/weave/common" "net" "sync" "time" diff --git a/nameserver/server_test.go b/nameserver/server_test.go index 5abc4244..4412d85c 100644 --- a/nameserver/server_test.go +++ b/nameserver/server_test.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "fmt" "github.com/miekg/dns" - . "github.com/zettio/weave/common" - wt "github.com/zettio/weave/testing" + . "github.com/weaveworks/weave/common" + wt "github.com/weaveworks/weave/testing" "net" "testing" "time" diff --git a/nameserver/zone.go b/nameserver/zone.go index 27b9ea47..ed6c0aa9 100644 --- a/nameserver/zone.go +++ b/nameserver/zone.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" "github.com/miekg/dns" - . "github.com/zettio/weave/common" + . "github.com/weaveworks/weave/common" "net" "sync" ) diff --git a/nameserver/zone_test.go b/nameserver/zone_test.go index c3d03f2f..b2722edc 100644 --- a/nameserver/zone_test.go +++ b/nameserver/zone_test.go @@ -1,7 +1,7 @@ package nameserver import ( - wt "github.com/zettio/weave/testing" + wt "github.com/weaveworks/weave/testing" "net" "testing" ) diff --git a/router/gossip_test.go b/router/gossip_test.go index 6ce97ebb..6a3d6837 100644 --- a/router/gossip_test.go +++ b/router/gossip_test.go @@ -1,7 +1,7 @@ package router import ( - wt "github.com/zettio/weave/testing" + wt "github.com/weaveworks/weave/testing" "testing" "time" ) diff --git a/router/mocks_test.go b/router/mocks_test.go index 3e10bc0c..cd58a08c 100644 --- a/router/mocks_test.go +++ b/router/mocks_test.go @@ -6,7 +6,7 @@ package router import ( - wt "github.com/zettio/weave/testing" + wt "github.com/weaveworks/weave/testing" "testing" ) diff --git a/router/peers_test.go b/router/peers_test.go index 46c2781a..5fe8745c 100644 --- a/router/peers_test.go +++ b/router/peers_test.go @@ -2,7 +2,7 @@ package router import ( "fmt" - wt "github.com/zettio/weave/testing" + wt "github.com/weaveworks/weave/testing" "math/rand" "testing" ) diff --git a/site/_layouts/default.html b/site/_layouts/default.html index b84feff7..67ee8d50 100644 --- a/site/_layouts/default.html +++ b/site/_layouts/default.html @@ -15,7 +15,7 @@
- View on GitHub + View on GitHub

weave

The Docker Network

diff --git a/site/building.md b/site/building.md index 915c03f5..9a4f0004 100644 --- a/site/building.md +++ b/site/building.md @@ -22,11 +22,11 @@ options are described below. ## Building directly on Ubuntu The weave git repository should be cloned into -`$GOPATH/src/github.com/zettio/weave`, in accordance with [the go +`$GOPATH/src/github.com/weaveworks/weave`, in accordance with [the go workspace conventions](https://golang.org/doc/code.html#Workspaces): ```bash -$ WEAVE=github.com/zettio/weave +$ WEAVE=github.com/weaveworks/weave $ git clone https://$WEAVE $GOPATH/src/$WEAVE $ cd $GOPATH/src/$WEAVE ``` @@ -49,8 +49,8 @@ $ make ``` This will build the weave components and package them into three -Docker images (`zettio/weave`, `zettio/weavedns`, and -`zettio/weaveexec`). These are then exported (as `weave.tar`, +Docker images (`weaveworks/weave`, `weaveworks/weavedns`, and +`weaveworks/weaveexec`). These are then exported (as `weave.tar`, `weavedns.tar` and `weaveexec.tar`). ## Building in a Docker container @@ -60,7 +60,7 @@ that has all the prerequisites. This avoids the need to download and install them for each build. In the `weave` directory, do: ```bash -$ sudo docker build -t zettio/weave-build build +$ sudo docker build -t weaveworks/weave-build build ``` Next we run a container based on that image. That container requires @@ -75,7 +75,7 @@ for a way to work around this problem. To perform a build, run: ```bash -$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock zettio/weave-build https://github.com/zettio/weave.git +$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock weaveworks/weave-build https://github.com/weaveworks/weave.git ``` This will clone the weave git repository, then do the build. @@ -87,7 +87,7 @@ The container arguments are passed to `git clone`, so for example, you can build from a forked repository and a specific branch with: ```bash -$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock zettio/weave-build -b +$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock weaveworks/weave-build -b ``` Alternatively, you might want to build from a weave source tree @@ -97,7 +97,7 @@ to bind the bind your go workspace containing the weave repository to passed in this case: ```bash -$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock -v :/home/go zettio/weave-build +$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock -v :/home/go weaveworks/weave-build ``` This will leave the intermediate build artifacts on the host, so that @@ -115,7 +115,7 @@ Vagrant to run VMs in. First, check out the code: ```bash -$ git clone https://github.com/zettio/weave +$ git clone https://github.com/weaveworks/weave $ cd weave ``` @@ -136,7 +136,7 @@ $ vagrant up and wait for a while (don't worry, the long download and package installation is done just once). The working directory is sync'ed with -`~/src/github.com/zettio/weave` on the VM, so you can edit files and +`~/src/github.com/weaveworks/weave` on the VM, so you can edit files and use git and so on in the regular filesystem. To build and run the code, you need to use the VM. To log in and build @@ -144,7 +144,7 @@ the weave image, do ```bash $ vagrant ssh -vm$ cd src/github.com/zettio/weave +vm$ cd src/github.com/weaveworks/weave vm$ make ``` diff --git a/site/features.md b/site/features.md index 2b732a07..de64420f 100644 --- a/site/features.md +++ b/site/features.md @@ -6,7 +6,7 @@ layout: default # Weave features Weave has a few more features beyond those illustrated by the [basic -example](https://github.com/zettio/weave#example): +example](https://github.com/weaveworks/weave#example): * [Virtual ethernet switch](#virtual-ethernet-switch) * [Application isolation](#application-isolation) diff --git a/site/how-it-works.md b/site/how-it-works.md index fbad0fc1..73c0ee78 100644 --- a/site/how-it-works.md +++ b/site/how-it-works.md @@ -397,4 +397,4 @@ further. ### Further reading More details on the inner workings of weave can be found in the -[architecture documentation](https://github.com/zettio/weave/blob/master/docs/architecture.txt). +[architecture documentation](https://github.com/weaveworks/weave/blob/master/docs/architecture.txt). diff --git a/site/index.md b/site/index.md index c057e983..544f341d 100644 --- a/site/index.md +++ b/site/index.md @@ -5,12 +5,12 @@ layout: default # weave documentation - * [Introduction and example (in README)](https://github.com/zettio/weave#readme) + * [Introduction and example (in README)](https://github.com/weaveworks/weave#readme) * [Features](features.html) * [Troubleshooting](troubleshooting.html) * [Building](building.html) * [How it works](how-it-works.html) - * [Contact information](https://github.com/zettio/weave#contact-us) + * [Contact information](https://github.com/weaveworks/weave#contact-us) * *Installation Notes* * [Using with boot2docker](boot2docker.html) * [Using with systemd](systemd.html) diff --git a/site/systemd.md b/site/systemd.md index b3e6483f..787bb6cd 100644 --- a/site/systemd.md +++ b/site/systemd.md @@ -64,7 +64,7 @@ context with the commands shown below. You will need to have the sudo semanage fcontext -a -t unconfined_exec_t -f f /usr/local/bin/weave sudo restorecon /usr/local/bin/weave -[readme]: https://github.com/zettio/weave/blob/master/README.md#installation +[readme]: https://github.com/weaveworks/weave/blob/master/README.md#installation [connect]: http://zettio.github.io/weave/features.html#dynamic-topologies [systemd]: http://www.freedesktop.org/wiki/Software/systemd/ [encryption]: http://zettio.github.io/weave/how-it-works.html#crypto diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 84b794b0..234b2e72 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -8,7 +8,7 @@ layout: default Make sure you are running the latest version - you can download it with - docker pull zettio/weave:latest + docker pull weaveworks/weave:latest Check the weave container logs with @@ -116,7 +116,7 @@ from 37.157.33.76:7195. The 'Routes' section summarised the information for deciding how to route packets between peers, which is mostly of interest when the weave network is not fully connected. See the -[architecture documentation](https://raw.githubusercontent.com/zettio/weave/master/docs/architecture.txt) +[architecture documentation](https://raw.githubusercontent.com/weaveworks/weave/master/docs/architecture.txt) for a full explanation. The 'Reconnects' section lists peers that this router is aware of, but is @@ -126,7 +126,7 @@ connecting again. Finally, status information from weave DNS is included. In this example, the DNS container has not been launched so no status information is -available (see the [WeaveDNS README](https://github.com/zettio/weave/blob/master/weavedns/README.md) +available (see the [WeaveDNS README](https://github.com/weaveworks/weave/blob/master/weavedns/README.md) for more information). ### List attached containers diff --git a/weavedns/README.md b/weavedns/README.md index 90b2bd86..83576f7c 100644 --- a/weavedns/README.md +++ b/weavedns/README.md @@ -154,7 +154,7 @@ it does not attempt to do load-balancing. ### Replacing one container with another at the same name -If you would like to deploy a new version of a service, keep the old one running because it has active connections but make all new requests go to the new version, then you can simply start the new server container and then [unregister](https://github.com/zettio/weave/tree/master/weavedns#unregistering) the old one from DNS. And finally, when all connections to the old server have terminated, stop the container as normal. +If you would like to deploy a new version of a service, keep the old one running because it has active connections but make all new requests go to the new version, then you can simply start the new server container and then [unregister](https://github.com/weaveworks/weave/tree/master/weavedns#unregistering) the old one from DNS. And finally, when all connections to the old server have terminated, stop the container as normal. ### Not watching docker events diff --git a/weavedns/main.go b/weavedns/main.go index 7c239e0c..2c3af2d4 100644 --- a/weavedns/main.go +++ b/weavedns/main.go @@ -3,10 +3,10 @@ package main import ( "flag" "fmt" - . "github.com/zettio/weave/common" - "github.com/zettio/weave/common/updater" - weavedns "github.com/zettio/weave/nameserver" - weavenet "github.com/zettio/weave/net" + . "github.com/weaveworks/weave/common" + "github.com/weaveworks/weave/common/updater" + weavedns "github.com/weaveworks/weave/nameserver" + weavenet "github.com/weaveworks/weave/net" "io" "net" "os" diff --git a/weaver/main.go b/weaver/main.go index 5ed4f0fa..469b713c 100644 --- a/weaver/main.go +++ b/weaver/main.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/davecheney/profile" "github.com/gorilla/mux" - weavenet "github.com/zettio/weave/net" - weave "github.com/zettio/weave/router" + weavenet "github.com/weaveworks/weave/net" + weave "github.com/weaveworks/weave/router" "io" "log" "net"