Update imports, ready for merge

README.md

@@ -1,28 +1,28 @@
 # GoAMZ
 
-[![Build Status](https://travis-ci.org/crowdmob/goamz.png?branch=master)](https://travis-ci.org/crowdmob/goamz)
+[![Build Status](https://travis-ci.org/goamz/goamz.png?branch=master)](https://travis-ci.org/goamz/goamz)
 
 The _goamz_ package enables Go programs to interact with Amazon Web Services.
 
-This is a fork of the version [developed within Canonical](https://wiki.ubuntu.com/goamz) with additional functionality and services from [a number of contributors](https://github.com/crowdmob/goamz/contributors)!
+This is a fork of the version [developed within Canonical](https://wiki.ubuntu.com/goamz) with additional functionality and services from [a number of contributors](https://github.com/goamz/goamz/contributors)!
 
 The API of AWS is very comprehensive, though, and goamz doesn't even scratch the surface of it. That said, it's fairly well tested, and is the foundation in which further calls can easily be integrated. We'll continue extending the API as necessary - Pull Requests are _very_ welcome!
 
 The following packages are available at the moment:
 
 ```
-github.com/crowdmob/goamz/aws
-github.com/crowdmob/goamz/cloudwatch
-github.com/crowdmob/goamz/dynamodb
-github.com/crowdmob/goamz/ec2
-github.com/crowdmob/goamz/elb
-github.com/crowdmob/goamz/iam
-github.com/crowdmob/goamz/s3
-github.com/crowdmob/goamz/sqs
-
-github.com/crowdmob/goamz/exp/mturk
-github.com/crowdmob/goamz/exp/sdb
-github.com/crowdmob/goamz/exp/sns
+github.com/goamz/goamz/aws
+github.com/goamz/goamz/cloudwatch
+github.com/goamz/goamz/dynamodb
+github.com/goamz/goamz/ec2
+github.com/goamz/goamz/elb
+github.com/goamz/goamz/iam
+github.com/goamz/goamz/s3
+github.com/goamz/goamz/sqs
+
+github.com/goamz/goamz/exp/mturk
+github.com/goamz/goamz/exp/sdb
+github.com/goamz/goamz/exp/sns
 ```
 
 Packages under `exp/` are still in an experimental or unfinished/unpolished state.
@@ -31,14 +31,14 @@ Packages under `exp/` are still in an experimental or unfinished/unpolished stat
 
 The API documentation is currently available at:
 
-[http://godoc.org/github.com/crowdmob/goamz](http://godoc.org/github.com/crowdmob/goamz)
+[http://godoc.org/github.com/goamz/goamz](http://godoc.org/github.com/goamz/goamz)
 
 ## How to build and install goamz
 
 Just use `go get` with any of the available packages. For example:
 
-* `$ go get github.com/crowdmob/goamz/ec2`
-* `$ go get github.com/crowdmob/goamz/s3`
+* `$ go get github.com/goamz/goamz/ec2`
+* `$ go get github.com/goamz/goamz/s3`
 
 ## Running tests
 
@@ -48,10 +48,10 @@ To run tests, first install gocheck with:
 
 Then run go test as usual:
 
-`$ go test github.com/crowdmob/goamz/...`
+`$ go test github.com/goamz/goamz/...`
 
 _Note:_ running all tests with the command `go test ./...` will currently fail as tests do not tear down their HTTP listeners.
 
 If you want to run integration tests (costs money), set up the EC2 environment variables as usual, and run:
 
-$ gotest -i
+$ gotest -i

autoscaling/autoscaling.go

@@ -3,7 +3,7 @@ package autoscaling
 import (
 	"encoding/xml"
 	"fmt"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"log"
 	"net/http"
 	"net/http/httputil"

autoscaling/autoscaling_test.go

@@ -1,8 +1,8 @@
 package autoscaling
 
 import (
-	"github.com/crowdmob/goamz/autoscaling/astest"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/autoscaling/astest"
+	"github.com/goamz/goamz/aws"
 	"testing"
 )
 

autoscaling/sign.go

@@ -4,7 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"sort"
 	"strings"
 )

aws/attempt_test.go

@@ -1,7 +1,7 @@
 package aws_test
 
 import (
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"launchpad.net/gocheck"
 	"time"
 )

aws/aws_test.go

@@ -1,7 +1,7 @@
 package aws_test
 
 import (
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"launchpad.net/gocheck"
 	"os"
 	"strings"

aws/sign_test.go

@@ -2,7 +2,7 @@ package aws_test
 
 import (
 	"fmt"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"launchpad.net/gocheck"
 	"net/http"
 	"strings"

cloudwatch/README.md

@@ -1,7 +1,7 @@
 #GoLang AWS Cloudwatch
 
 ## Installation
-Please refer to the project's main page at [https://github.com/crowdmob/goamz](https://github.com/crowdmob/goamz) for instructions about how to install.
+Please refer to the project's main page at [https://github.com/goamz/goamz](https://github.com/goamz/goamz) for instructions about how to install.
 
 ## Available methods
 
@@ -30,8 +30,8 @@ import (
     "fmt"
     "time"
     "os"
-    "github.com/crowdmob/goamz/aws"
-    "github.com/crowdmob/goamz/cloudwatch"
+    "github.com/goamz/goamz/aws"
+    "github.com/goamz/goamz/cloudwatch"
 )
 
 func test_get_metric_statistics() {
@@ -79,8 +79,8 @@ import (
     "fmt"
     "time"
     "os"
-    "github.com/crowdmob/goamz/aws"
-    "github.com/crowdmob/goamz/cloudwatch"
+    "github.com/goamz/goamz/aws"
+    "github.com/goamz/goamz/cloudwatch"
 )
 
 func test_list_metrics() {
@@ -102,4 +102,4 @@ func test_list_metrics() {
         fmt.Printf("Error: %+v\n", err)
     }
 }
-```
+```

cloudwatch/cloudwatch.go

@@ -18,7 +18,7 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"github.com/feyeleanor/sets"
 	"strconv"
 	"time"

cloudwatch/cloudwatch_test.go

@@ -1,9 +1,9 @@
 package cloudwatch_test
 
 import (
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/cloudwatch"
-	"github.com/crowdmob/goamz/testutil"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/cloudwatch"
+	"github.com/goamz/goamz/testutil"
 	"launchpad.net/gocheck"
 	"testing"
 )

dynamodb/dynamodb.go

@@ -3,7 +3,7 @@ package dynamodb
 import simplejson "github.com/bitly/go-simplejson"
 import (
 	"errors"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"io/ioutil"
 	"log"
 	"net/http"

dynamodb/dynamodb_test.go

@@ -2,8 +2,8 @@ package dynamodb_test
 
 import (
 	"flag"
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/dynamodb"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/dynamodb"
 	"launchpad.net/gocheck"
 	"testing"
 	"time"

dynamodb/item_test.go

@@ -1,7 +1,7 @@
 package dynamodb_test
 
 import (
-	"github.com/crowdmob/goamz/dynamodb"
+	"github.com/goamz/goamz/dynamodb"
 	"launchpad.net/gocheck"
 )
 

dynamodb/marshaller_test.go

@@ -1,7 +1,7 @@
 package dynamodb_test
 
 import (
-	"github.com/crowdmob/goamz/dynamodb"
+	"github.com/goamz/goamz/dynamodb"
 	"launchpad.net/gocheck"
 	"time"
 )

dynamodb/query_builder_test.go

@@ -2,8 +2,8 @@ package dynamodb_test
 
 import (
 	simplejson "github.com/bitly/go-simplejson"
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/dynamodb"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/dynamodb"
 	"launchpad.net/gocheck"
 )
 

dynamodb/table_test.go

@@ -1,7 +1,7 @@
 package dynamodb_test
 
 import (
-	"github.com/crowdmob/goamz/dynamodb"
+	"github.com/goamz/goamz/dynamodb"
 	"launchpad.net/gocheck"
 )
 

ec2/ec2.go

@@ -15,7 +15,7 @@ import (
 	"encoding/hex"
 	"encoding/xml"
 	"fmt"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"log"
 	"net/http"
 	"net/http/httputil"

ec2/ec2_test.go

@@ -1,9 +1,9 @@
 package ec2_test
 
 import (
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/ec2"
-	"github.com/crowdmob/goamz/testutil"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/ec2"
+	"github.com/goamz/goamz/testutil"
 	"launchpad.net/gocheck"
 	"testing"
 )

ec2/ec2i_test.go

@@ -3,9 +3,9 @@ package ec2_test
 import (
 	"crypto/rand"
 	"fmt"
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/ec2"
-	"github.com/crowdmob/goamz/testutil"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/ec2"
+	"github.com/goamz/goamz/testutil"
 	"launchpad.net/gocheck"
 )
 

ec2/ec2t_test.go

@@ -2,10 +2,10 @@ package ec2_test
 
 import (
 	"fmt"
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/ec2"
-	"github.com/crowdmob/goamz/ec2/ec2test"
-	"github.com/crowdmob/goamz/testutil"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/ec2"
+	"github.com/goamz/goamz/ec2/ec2test"
+	"github.com/goamz/goamz/testutil"
 	"launchpad.net/gocheck"
 	"regexp"
 	"sort"

ec2/ec2test/server.go

@@ -8,7 +8,7 @@ import (
 	"encoding/base64"
 	"encoding/xml"
 	"fmt"
-	"github.com/crowdmob/goamz/ec2"
+	"github.com/goamz/goamz/ec2"
 	"io"
 	"net"
 	"net/http"

ec2/export_test.go

@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"time"
 )
 

ec2/sign.go

@@ -4,7 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"sort"
 	"strings"
 )

ec2/sign_test.go

@@ -1,8 +1,8 @@
 package ec2_test
 
 import (
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/ec2"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/ec2"
 	"launchpad.net/gocheck"
 )
 

elb/elb.go

@@ -4,7 +4,7 @@ package elb
 import (
 	"encoding/xml"
 	"fmt"
-	"github.com/crowdmob/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"net/http"
 	"net/url"
 	"strconv"

elb/elb_test.go

@@ -1,8 +1,8 @@
 package elb_test
 
 import (
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/elb"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/elb"
 	"launchpad.net/gocheck"
 	"time"
 )

elb/elbi_test.go

@@ -2,9 +2,9 @@ package elb_test
 
 import (
 	"flag"
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/ec2"
-	"github.com/crowdmob/goamz/elb"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/ec2"
+	"github.com/goamz/goamz/elb"
 	"launchpad.net/gocheck"
 )
 

elb/elbt_test.go

@@ -1,9 +1,9 @@
 package elb_test
 
 import (
-	"github.com/crowdmob/goamz/aws"
-	"github.com/crowdmob/goamz/elb"
-	"github.com/crowdmob/goamz/elb/elbtest"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/elb"
+	"github.com/goamz/goamz/elb/elbtest"
 	"launchpad.net/gocheck"
 )
 

elb/elbtest/server.go

@@ -6,7 +6,7 @@ package elbtest
 import (
 	"encoding/xml"
 	"fmt"
-	"github.com/crowdmob/goamz/elb"
+	"github.com/goamz/goamz/elb"
 	"net"
 	"net/http"
 	"net/url"