From f228812746f270ffbd3bf10e861219f4b2ce1187 Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Fri, 3 Feb 2017 22:31:51 -0800 Subject: [PATCH] Update github.com/shiriou/gopsutil's `vendor.json` entries. Direct to `master` commit now that https://github.com/shirou/gopsutil/pull/312 has been merged. --- vendor/github.com/shirou/gopsutil/LICENSE | 61 +++++++++++++++++++++++ vendor/vendor.json | 40 +++++++++++---- 2 files changed, 90 insertions(+), 11 deletions(-) create mode 100644 vendor/github.com/shirou/gopsutil/LICENSE diff --git a/vendor/github.com/shirou/gopsutil/LICENSE b/vendor/github.com/shirou/gopsutil/LICENSE new file mode 100644 index 0000000000..da71a5e729 --- /dev/null +++ b/vendor/github.com/shirou/gopsutil/LICENSE @@ -0,0 +1,61 @@ +gopsutil is distributed under BSD license reproduced below. + +Copyright (c) 2014, WAKAYAMA Shirou +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the gopsutil authors nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +------- +internal/common/binary.go in the gopsutil is copied and modifid from golang/encoding/binary.go. + + + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/vendor/vendor.json b/vendor/vendor.json index 55d0b0bcb7..fbcb5340d6 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -695,26 +695,44 @@ { "checksumSHA1": "9rCHOi3ELajBtQUPWxxmEo/Nalk=", "path": "github.com/shirou/gopsutil", - "revision": "b68f0fdb25a7785ce7a38e77330d3dd415010106", - "revisionTime": "2017-02-01T16:25:48Z" + "revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35", + "revisionTime": "2017-02-04T05:36:48Z" }, { - "checksumSHA1": "z30Q7+rqd6FGTNeJlvmAccYrHQ0=", + "checksumSHA1": "zW2k8E1gkuySzTz2eXuSEDhpffY=", + "path": "github.com/shirou/gopsutil/cpu", + "revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35", + "revisionTime": "2017-02-04T05:36:48Z" + }, + { + "checksumSHA1": "j5cGmi4mFeXmsLpSTiakU/k7aOc=", "path": "github.com/shirou/gopsutil/host", - "revision": "b68f0fdb25a7785ce7a38e77330d3dd415010106", - "revisionTime": "2017-02-01T16:25:48Z" + "revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35", + "revisionTime": "2017-02-04T05:36:48Z" }, { - "checksumSHA1": "F4xYQ60JlmamCUSCJl7zuuq58Kw=", + "checksumSHA1": "hz9RxkaV3Tnju2eiHBWO/Yv7n5c=", "path": "github.com/shirou/gopsutil/internal/common", - "revision": "b68f0fdb25a7785ce7a38e77330d3dd415010106", - "revisionTime": "2017-02-01T16:25:48Z" + "revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35", + "revisionTime": "2017-02-04T05:36:48Z" }, { - "checksumSHA1": "6PZpekfhutCewqXOVB2Pu8OuUnE=", + "checksumSHA1": "XQwjGKI51Y3aQ3/jNyRh9Gnprgg=", + "path": "github.com/shirou/gopsutil/mem", + "revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35", + "revisionTime": "2017-02-04T05:36:48Z" + }, + { + "checksumSHA1": "OSvOZs5uK5iolCOeS46nB2InVy8=", + "path": "github.com/shirou/gopsutil/net", + "revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35", + "revisionTime": "2017-02-04T05:36:48Z" + }, + { + "checksumSHA1": "JX0bRK/BdKVfbm4XOxMducVdY58=", "path": "github.com/shirou/gopsutil/process", - "revision": "b68f0fdb25a7785ce7a38e77330d3dd415010106", - "revisionTime": "2017-02-01T16:25:48Z" + "revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35", + "revisionTime": "2017-02-04T05:36:48Z" }, { "checksumSHA1": "Nve7SpDmjsv6+rhkXAkfg/UQx94=",