Merge remote-tracking branch 'origin/master' into coerceInt_fix

flynn-archive · Dec 1, 2015 · fb3492f · fb3492f
2 parents bd1e0fd + 344abcc
commit fb3492f
Show file tree

Hide file tree

Showing 59 changed files with 8,646 additions and 1,253 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,3 +10,4 @@ before_install:
 
 script:
   - $HOME/gopath/bin/goveralls -service=travis-ci
+  - go vet ./...
diff --git a/README.md b/README.md
@@ -24,8 +24,8 @@ import (
 
 func main() {
 	// Schema
-	fields := graphql.FieldConfigMap{
-		"hello": &graphql.FieldConfig{
+	fields := graphql.Fields{
+		"hello": &graphql.Field{
 			Type: graphql.String,
 			Resolve: func(p graphql.GQLFRParams) interface{} {
 				return "world"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ before_install:

		script:
		- $HOME/gopath/bin/goveralls -service=travis-ci
		- go vet ./...