From ad4af06802b1996a5ec317011346cdb682dad450 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Thu, 7 Jan 2016 10:58:53 -0700 Subject: [PATCH] Update Makefile and Godeps and various fixups --- Godeps | 38 +++++++++++++++++------------------ circle.yml | 6 +++--- plugins/system/docker_test.go | 1 - 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Godeps b/Godeps index d17d8dd25..2584179bd 100644 --- a/Godeps +++ b/Godeps @@ -1,51 +1,51 @@ git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git dbd8d5c40a582eb9adacde36b47932b3a3ad0034 -github.com/Shopify/sarama 159e9990b0796511607dd0d7aaa3eb37d1829d16 +github.com/Shopify/sarama d37c73f2b2bce85f7fa16b6a550d26c5372892ef github.com/Sirupsen/logrus 446d1c146faa8ed3f4218f056fcd165f6bcfda81 github.com/amir/raidman 6a8e089bbe32e6b907feae5ba688841974b3c339 -github.com/armon/go-metrics 06b60999766278efd6d2b5d8418a58c3d5b99e87 -github.com/aws/aws-sdk-go 999b1591218c36d5050d1ba7266eba956e65965f +github.com/armon/go-metrics 345426c77237ece5dab0e1605c3e4b35c3f54757 +github.com/aws/aws-sdk-go f09322ae1e6468fe828c862542389bc45baf3c00 github.com/beorn7/perks b965b613227fddccbfffe13eae360ed3fa822f8d -github.com/boltdb/bolt b34b35ea8d06bb9ae69d9a349119252e4c1d8ee0 +github.com/boltdb/bolt 34a0fa5307f7562980fb8e7ff4723f7987edf49b github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99 github.com/dancannon/gorethink a124c9663325ed9f7fb669d17c69961b59151e6e github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d -github.com/eapache/go-resiliency f341fb4dca45128e4aa86389fa6a675d55fe25e1 +github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3 github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367 -github.com/fsouza/go-dockerclient 7177a9e3543b0891a5d91dbf7051e0f71455c8ef -github.com/go-ini/ini 9314fb0ef64171d6a3d0a4fa570dfa33441cba05 -github.com/go-sql-driver/mysql d512f204a577a4ab037a1816604c48c9c13210be -github.com/gogo/protobuf e492fd34b12d0230755c45aa5fb1e1eea6a84aa9 -github.com/golang/protobuf 68415e7123da32b07eab49c96d2c4d6158360e9b +github.com/fsouza/go-dockerclient 175e1df973274f04e9b459a62cffc49808f1a649 +github.com/go-ini/ini afbd495e5aaea13597b5e14fe514ddeaa4d76fc3 +github.com/go-sql-driver/mysql 7a8740a6bd8feb6af5786ab9a9f1513970019d8c +github.com/gogo/protobuf 7b1331554dbe882cb3613ee8f1824a5583627963 +github.com/golang/protobuf 2402d76f3d41f928c7902a765dfc872356dd3aad github.com/golang/snappy 723cc1e459b8eea2dea4583200fd60757d40097a github.com/gonuts/go-shellquote e842a11b24c6abfb3dd27af69a17f482e4b483c2 -github.com/hailocab/go-hostpool 0637eae892be221164aff5fcbccc57171aea6406 +github.com/hailocab/go-hostpool 50839ee41f32bfca8d03a183031aa634b2dc1c64 github.com/hashicorp/go-msgpack fa3f63826f7c23912c15263591e65d54d080b458 github.com/hashicorp/raft d136cd15dfb7876fd7c89cad1995bc4f19ceb294 github.com/hashicorp/raft-boltdb d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee -github.com/influxdb/influxdb 69a7664f2d4b75aec300b7cbfc7e57c971721f04 +github.com/influxdb/influxdb bd63489ef0faae2465ae5b1f0a28bd7e71e02e38 github.com/jmespath/go-jmespath c01cf91b011868172fdcd9f41838e80c9d716264 -github.com/klauspost/crc32 0aff1ea9c20474c3901672b5b6ead0ac611156de +github.com/klauspost/crc32 a3b15ae34567abb20a22992b989cd76f48d09c47 github.com/lib/pq 11fc39a580a008f1f39bb3d11d984fb34ed778d9 github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453 github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b github.com/naoina/toml 751171607256bb66e64c9f0220c00662420c38e9 github.com/nsqio/go-nsq 2118015c120962edc5d03325c680daf3163a8b5f -github.com/pborman/uuid cccd189d45f7ac3368a0d127efb7f4d08ae0b655 +github.com/pborman/uuid dee7705ef7b324f27ceb85a121c61f2c2e8ce988 github.com/pmezard/go-difflib e8554b8641db39598be7f6342874b958f12ae1d4 github.com/prometheus/client_golang 67994f177195311c3ea3d4407ed0175e34a4256f github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6 -github.com/prometheus/common 56b90312e937d43b930f06a59bf0d6a4ae1944bc +github.com/prometheus/common 0a3005bb37bc411040083a55372e77c405f6464c github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8 github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f -github.com/shirou/gopsutil fc932d9090f13a84fb4b3cb8baa124610cab184c +github.com/shirou/gopsutil ef151b7ff7fe76308f89a389447b7b78dfa02e0f github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744 github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94 -github.com/stretchr/testify e3a8ff8ce36581f87a15341206f205b1da467059 +github.com/stretchr/testify c92828f29518bc633893affbce12904ba41a7cfa github.com/wvanbergen/kafka 1a8639a45164fcc245d5c7b4bd3ccfbd1a0ffbf3 github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8 -golang.org/x/crypto 7b85b097bf7527677d54d3220065e966a0e3b613 -golang.org/x/net 1796f9b8b7178e3c7587dff118d3bb9d37f9b0b3 +golang.org/x/crypto f23ba3a5ee43012fcb4b92e1a2a405a92554f4f2 +golang.org/x/net 520af5de654dc4dd4f0f65aa40e66dbbd9043df1 gopkg.in/dancannon/gorethink.v1 a124c9663325ed9f7fb669d17c69961b59151e6e gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715 gopkg.in/mgo.v2 e30de8ac9ae3b30df7065f766c71f88bba7d4e49 diff --git a/circle.yml b/circle.yml index c1c2d35ab..2d006d70e 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,9 @@ machine: post: - sudo service zookeeper stop - go version - - go version | grep 1.5.1 || sudo rm -rf /usr/local/go - - wget https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz - - sudo tar -C /usr/local -xzf go1.5.1.linux-amd64.tar.gz + - go version | grep 1.5.2 || sudo rm -rf /usr/local/go + - wget https://storage.googleapis.com/golang/go1.5.2.linux-amd64.tar.gz + - sudo tar -C /usr/local -xzf go1.5.2.linux-amd64.tar.gz - go version dependencies: diff --git a/plugins/system/docker_test.go b/plugins/system/docker_test.go index eb9cb41c7..9ed06dd3e 100644 --- a/plugins/system/docker_test.go +++ b/plugins/system/docker_test.go @@ -9,7 +9,6 @@ import ( "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/docker" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )