Merge pull request #528 from 'bboreham/name_change'

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).

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.
@@ -102,7 +102,7 @@ Note that we could instead have told the weave on `$HOST1` to connect to
 weave automatically (re)connects to peers when they become
 available. Also, we can tell weave to connect to multiple peers by
 supplying multiple addresses, separated by spaces. And we can
-[add peers dynamically](http://zettio.github.io/weave/features.html#dynamic-topologies).
+[add peers dynamically](http://weaveworks.github.io/weave/features.html#dynamic-topologies).
 
 Now that we've got everything set up, let's see whether our containers
 can talk to each other...
@@ -130,17 +130,17 @@ to each other.
 
 ## Find out more
 
- * [Documentation homepage](http://zettio.github.io/weave/)
- * [Features](http://zettio.github.io/weave/features.html)
- * [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)
+ * [Documentation homepage](http://weaveworks.github.io/weave/)
+ * [Features](http://weaveworks.github.io/weave/features.html)
+ * [Troubleshooting](http://weaveworks.github.io/weave/troubleshooting.html)
+ * [Building](http://weaveworks.github.io/weave/building.html)
+ * [How it works](http://weaveworks.github.io/weave/how-it-works.html)
+ * [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`.
 

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"

bin/merge-into-gh-pages

@@ -2,15 +2,15 @@
 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"
 
 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
 

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

bin/release

@@ -3,7 +3,7 @@
 set -e
 
 SUDO=${SUDO-sudo}
-GITHUB_USER=${GITHUB_USER:-zettio}
+GITHUB_USER=${GITHUB_USER:-weaveworks}
 DOCKERHUB_USER=${DOCKERHUB_USER:-zettio}
 RELEASE_NAME=${RELEASE_NAME:-"Weave"}
 RELEASE_DESCRIPTION=${RELEASE_DESCRIPTION:-"Weaving Containers into Applications"}

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 <host gopath>:${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

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 {

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"

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"

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"

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"

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"

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"
 )
 

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"
 )
 

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"

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"

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"

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"
 )

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"
 )

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"
 )

router/mocks_test.go

@@ -6,7 +6,7 @@
 package router
 
 import (
-	wt "github.com/zettio/weave/testing"
+	wt "github.com/weaveworks/weave/testing"
 	"testing"
 )
 

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"
 )

site/_layouts/default.html

@@ -15,7 +15,7 @@
     <!-- HEADER -->
     <div id="header_wrap" class="outer">
         <header class="inner">
-          <a id="forkme_banner" href="https://github.com/zettio/weave">View on GitHub</a>
+          <a id="forkme_banner" href="https://github.com/weaveworks/weave">View on GitHub</a>
 
           <h1 id="project_title">weave</h1>
           <h2 id="project_tagline">The Docker Network</h2>

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
 ```
@@ -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 <branch name> <repo URI>
+$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock weaveworks/weave-build -b <branch name> <repo URI>
 ```
 
 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 <host gopath>:/home/go zettio/weave-build
+$ sudo docker run -v /var/run/docker.sock:/var/run/docker.sock -v <host gopath>:/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,15 +136,15 @@ $ 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
 the weave image, do
 
 ```bash
 $ vagrant ssh
-vm$ cd src/github.com/zettio/weave
+vm$ cd src/github.com/weaveworks/weave
 vm$ make
 ```
 

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)

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).

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)