From: Bruno Clermont <bruno@robotinfra.com>
Date: Thu, 8 Dec 2016 10:20:27 +0000 (+0800)
Subject: Only use YAML binding version 2.
X-Git-Tag: 7.1^2~30
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=443636bb4dd00aa3b054e233ad09671ac04913ed

Only use YAML binding version 2.

https://github.com/go-yaml/yaml#api-documentation
---

diff --git a/.gitmodules b/.gitmodules
index 82df1f7..c837a03 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,10 @@
 [submodule "src/golang.org/x/crypto"]
 	path = src/golang.org/x/crypto
 	url = https://go.googlesource.com/crypto
-[submodule "src/github.com/go-yaml/yaml"]
-	path = src/github.com/go-yaml/yaml
-	url = https://github.com/go-yaml/yaml.git
 [submodule "src/cypherpunks.ru/balloon"]
 	path = src/cypherpunks.ru/balloon
 	url = git://git.cypherpunks.ru/balloon.git
+[submodule "src/gopkg.in/yaml.v2"]
+	path = src/gopkg.in/yaml.v2
+	url = https://github.com/go-yaml/yaml.git
+	branch = v2
diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
index ea61c81..7c63f65 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
@@ -24,7 +24,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/go-yaml/yaml"
+	"gopkg.in/yaml.v2"
 
 	"cypherpunks.ru/govpn"
 )
diff --git a/src/github.com/go-yaml/yaml b/src/github.com/go-yaml/yaml
deleted file mode 160000
index e4d366f..0000000
--- a/src/github.com/go-yaml/yaml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e4d366fc3c7938e2958e662b4258c7a89e1f0e3e
diff --git a/src/gopkg.in/yaml.v2 b/src/gopkg.in/yaml.v2
new file mode 160000
index 0000000..a5b47d3
--- /dev/null
+++ b/src/gopkg.in/yaml.v2
@@ -0,0 +1 @@
+Subproject commit a5b47d31c556af34a302ce5d659e6fea44d90de0