Merge branch 'master' into websocket

2017-01-31 08:56:49 +01:00
parent 2594041eed 9ba1ea0179
commit 8a95c563bb
283 changed files with 29756 additions and 7727 deletions
@@ -298,6 +298,14 @@
 			"version": "v1.5.8",
 			"versionExact": "v1.5.8"
 		},
+		{
+			"checksumSHA1": "HtKiIAPKsBg2s1c5ytRkdZ/lqO8=",
+			"path": "github.com/aws/aws-sdk-go/service/s3",
+			"revision": "898c81ba64b9a467379d35e3fabad133beae0ee4",
+			"revisionTime": "2016-11-18T23:08:35Z",
+			"version": "v1.5.8",
+			"versionExact": "v1.5.8"
+		},
 		{
 			"checksumSHA1": "ouwhxcAsIYQ6oJbMRdLW/Ys/iyg=",
 			"path": "github.com/aws/aws-sdk-go/service/sts",
@@ -409,12 +417,6 @@
 			"path": "gopkg.in/gomail.v2",
 			"revision": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1",
 			"revisionTime": "2016-04-11T21:29:32Z"
-		},
-		{
-			"checksumSHA1": "PoHLopxwkiXxa3uVhezeq/qJ/Vo=",
-			"path": "gopkg.in/guregu/null.v3",
-			"revision": "41961cea0328defc5f95c1c473f89ebf0d1813f6",
-			"revisionTime": "2016-02-28T00:53:16Z"
 		}
 	],
 	"rootPath": "github.com/grafana/grafana"