From 56165d9a316d54d02b82d0fe54c1a202f8a09e0e Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Sat, 3 Mar 2018 08:22:31 -0500 Subject: [PATCH] fixup! Updating vendored dependencies --- Gopkg.lock | 4 +-- Gopkg.toml | 4 --- vendor/github.com/hairyhenderson/toml/COPYING | 27 ++++++++++++------- vendor/github.com/hairyhenderson/toml/lex.go | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 2f3176fae..bd5ac88f7 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -121,7 +121,7 @@ branch = "support-map-interface-keys" name = "github.com/hairyhenderson/toml" packages = ["."] - revision = "44f109fd33239176c2a8febd4811e1dbc87d9c57" + revision = "d1df168234942b108d288625a58afe19791630bd" [[projects]] name = "github.com/hashicorp/consul" @@ -326,6 +326,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "ecd9961fdb6e66758dcd797aacc5a5e33fa93be4b63da8fe91ac6a2a2d223efb" + inputs-digest = "149aecc123ec6f0be1528d26e722e887e18a8b34bdf70b9035323f9763883827" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 505c581c9..71f1c5ec6 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -6,7 +6,3 @@ [[constraint]] name = "github.com/hairyhenderson/toml" branch = "support-map-interface-keys" - -[[constraint]] - name = "gopkg.in/yaml.v2" - branch = "v2" diff --git a/vendor/github.com/hairyhenderson/toml/COPYING b/vendor/github.com/hairyhenderson/toml/COPYING index 5a8e33254..01b574320 100644 --- a/vendor/github.com/hairyhenderson/toml/COPYING +++ b/vendor/github.com/hairyhenderson/toml/COPYING @@ -1,14 +1,21 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 +The MIT License (MIT) - Copyright (C) 2004 Sam Hocevar +Copyright (c) 2013 TOML authors - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/github.com/hairyhenderson/toml/lex.go b/vendor/github.com/hairyhenderson/toml/lex.go index 6dee7fc79..e0a742a88 100644 --- a/vendor/github.com/hairyhenderson/toml/lex.go +++ b/vendor/github.com/hairyhenderson/toml/lex.go @@ -775,7 +775,7 @@ func lexDatetime(lx *lexer) stateFn { return lexDatetime } switch r { - case '-', 'T', ':', '.', 'Z': + case '-', 'T', ':', '.', 'Z', '+': return lexDatetime }