Merge pull request #567 from cloudflare/nick/1.2

Bump version to 1.2

Author: kisom

cli/version/version.go

@@ -14,7 +14,7 @@ var version = struct {
 	Minor    int
 	Patch    int
 	Revision string
-}{1, 1, 0, "release"}
+}{1, 2, 0, "release"}
 
 func versionString() string {
 	return fmt.Sprintf("%d.%d.%d", version.Major, version.Minor, version.Patch)

cli/version/version_test.go

@@ -8,8 +8,8 @@ import (
 
 func TestVersionString(t *testing.T) {
 	version := versionString()
-	if version != "1.1.0" {
-		t.Fatal("verstion string is not returned correctly")
+	if version != "1.2.0" {
+		t.Fatal("version string is not returned correctly")
 	}
 }