build: upgraded yaml to v2

cockroachdb · Aug 22, 2016 · bf8ca7a · bf8ca7a
1 parent 0dfa3cf
commit bf8ca7a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/GLOCKFILE b/GLOCKFILE
@@ -113,7 +113,7 @@ google.golang.org/appengine e951d3868b377b14f4e60efa3a301532ee3c1ebf
 google.golang.org/grpc 8a81ddda27e5fdd3b56f3ce841b37dbf7387dd26
 gopkg.in/check.v1 4f90aeace3a26ad7021961c297b22c42160c7b25
 gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-gopkg.in/yaml.v1 9f9df34309c04878acc86042b16630b0f696e1de
+gopkg.in/yaml.v2 e4d366fc3c7938e2958e662b4258c7a89e1f0e3e
 honnef.co/go/lint a730e73f0085f274d67b586a1d587fd6e42e6708
 honnef.co/go/simple aa6f9e72ec86009fdfc110b52e2c769d48d5a904
 honnef.co/go/staticcheck 02337b3080e043d43781e1a0d129df14848f9507

diff --git a/cli/zone.go b/cli/zone.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v1"
+	"gopkg.in/yaml.v2"
 
 	"github.com/cockroachdb/cockroach/config"
 	"github.com/cockroachdb/cockroach/keys"

diff --git a/sql/parallel_test.go b/sql/parallel_test.go
@@ -34,7 +34,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	"gopkg.in/yaml.v1"
+	"gopkg.in/yaml.v2"
 
 	"github.com/cockroachdb/cockroach/base"
 	"github.com/cockroachdb/cockroach/config"