Merge branch 'release/2.2.0'

albertrdixon · Jul 25, 2015 · 6f30a30 · 6f30a30
2 parents 8e1135b + a15fd73
commit 6f30a30
Show file tree

Hide file tree

Showing 112 changed files with 49,305 additions and 1,663 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .DS*
-*.tar.gz
-t2*
-!t2/
+*.tgz
 out/
 *.env
+bin
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,8 @@ deploy:
   api_key:
     secure: gE+O8G3DK0jhYc7lIIz9wlRLSZTXau7WdWz3dQqG/DAPvkJbjcGAjA3WmW81KcEs4Ob0ODIdChSGJY5+px/w0aFTdAAP27NvoPRwute2VcLRevpjCglroqz3girj3KUVJmACtya4h/nJZ3Eo20/6/lTJTE6y6W9dVhbwx1DpKlM=
   file:
-    - tnator-linux-amd64.tar.gz
-    - tnator-darwin-amd64.tar.gz
+    - t2-linux.tgz
+    - t2-darwin.tgz
   on:
     repo: albertrdixon/tmplnator
     tags: true
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json_test.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/seq_test.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/seq_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md