Merge pull request #562 from prometheus/beorn7/vendoring

Update vendoring.

Godeps/Godeps.json

@@ -1,7 +1,16 @@
 {
 	"ImportPath": "github.com/prometheus/prometheus",
-	"GoVersion": "go1.4.1",
+	"GoVersion": "go1.4",
 	"Deps": [
+		{
+			"ImportPath": "bitbucket.org/ww/goautoneg",
+			"Comment": "null-5",
+			"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
+		},
+		{
+			"ImportPath": "github.com/beorn7/perks/quantile",
+			"Rev": "b965b613227fddccbfffe13eae360ed3fa822f8d"
+		},
 		{
 			"ImportPath": "github.com/golang/glog",
 			"Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
@@ -18,35 +27,25 @@
 			"ImportPath": "github.com/miekg/dns",
 			"Rev": "b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641"
 		},
-		{
-			"ImportPath": "github.com/prometheus/client_golang/_vendor/goautoneg",
-			"Comment": "0.2.0",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
-		},
-		{
-			"ImportPath": "github.com/prometheus/client_golang/_vendor/perks/quantile",
-			"Comment": "0.2.0",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
-		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/extraction",
-			"Comment": "0.2.0",
+			"Comment": "0.2.0-3-ga6c5e0f",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
+			"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/model",
-			"Comment": "0.2.0",
+			"Comment": "0.2.0-3-ga6c5e0f",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
+			"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/prometheus",
-			"Comment": "0.2.0",
+			"Comment": "0.2.0-3-ga6c5e0f",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
+			"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/text",
-			"Comment": "0.2.0",
+			"Comment": "0.2.0-3-ga6c5e0f",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
+			"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_model/go",

Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/MANIFEST

@@ -1 +0,0 @@
-Imported at 75cd24fc2f2c from https://bitbucket.org/ww/goautoneg.

Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go

@@ -18,11 +18,9 @@ import (
 	"io"
 	"math"
 
-	dto "github.com/prometheus/client_model/go"
-
 	"github.com/matttproud/golang_protobuf_extensions/ext"
-
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 type metricFamilyProcessor struct{}

Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go

@@ -20,8 +20,6 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/prometheus/prometheus/utility/test"
-
 	"github.com/prometheus/client_golang/model"
 )
 
@@ -47,7 +45,8 @@ func (s *testProcessor001ProcessScenario) test(t testing.TB, set int) {
 	options := &ProcessOptions{
 		Timestamp: test001Time,
 	}
-	if err := Processor001.ProcessSingle(reader, s, options); !test.ErrorEqual(s.err, err) {
+	err = Processor001.ProcessSingle(reader, s, options)
+	if s.err != err && (s.err == nil || err == nil || err.Error() != s.err.Error()) {
 		t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
 	}
 

Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go

@@ -23,8 +23,6 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/prometheus/prometheus/utility/test"
-
 	"github.com/prometheus/client_golang/model"
 )
 
@@ -50,7 +48,8 @@ func (s *testProcessor002ProcessScenario) test(t testing.TB, set int) {
 	options := &ProcessOptions{
 		Timestamp: test002Time,
 	}
-	if err := Processor002.ProcessSingle(reader, s, options); !test.ErrorEqual(s.err, err) {
+	err = Processor002.ProcessSingle(reader, s, options)
+	if s.err != err && (s.err == nil || err == nil || err.Error() != s.err.Error()) {
 		t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
 	}
 

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go

@@ -11,9 +11,8 @@ import (
 
 	"github.com/prometheus/client_golang/model"
 
-	dto "github.com/prometheus/client_model/go"
-
 	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 var (

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/example_selfcollector_test.go

@@ -17,10 +17,8 @@ import (
 	"runtime"
 
 	"github.com/golang/protobuf/proto"
-
-	dto "github.com/prometheus/client_model/go"
-
 	"github.com/prometheus/client_golang/prometheus"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func NewCallbackMetric(desc *prometheus.Desc, callback func() float64) *CallbackMetric {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/examples_test.go

@@ -21,11 +21,9 @@ import (
 	"runtime"
 	"sort"
 
-	dto "github.com/prometheus/client_model/go"
-
 	"github.com/golang/protobuf/proto"
-
 	"github.com/prometheus/client_golang/prometheus"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func ExampleGauge() {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar_test.go

@@ -19,9 +19,8 @@ import (
 	"sort"
 	"strings"
 
-	dto "github.com/prometheus/client_model/go"
-
 	"github.com/prometheus/client_golang/prometheus"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func ExampleExpvarCollector() {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go

@@ -21,7 +21,6 @@ import (
 	"sync/atomic"
 
 	"github.com/golang/protobuf/proto"
-
 	"github.com/prometheus/client_golang/model"
 	dto "github.com/prometheus/client_model/go"
 )

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go

@@ -33,13 +33,11 @@ import (
 	"strings"
 	"sync"
 
-	dto "github.com/prometheus/client_model/go"
+	"bitbucket.org/ww/goautoneg"
-
 	"github.com/golang/protobuf/proto"
-
-	"github.com/prometheus/client_golang/_vendor/goautoneg"
 	"github.com/prometheus/client_golang/model"
 	"github.com/prometheus/client_golang/text"
+	dto "github.com/prometheus/client_model/go"
 )
 
 var (

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go

@@ -20,12 +20,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/beorn7/perks/quantile"
 	"github.com/golang/protobuf/proto"
-
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/prometheus/client_golang/_vendor/perks/quantile"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A Summary captures individual observations from an event or sample stream and

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go

@@ -20,9 +20,8 @@ import (
 	"sort"
 	"sync/atomic"
 
-	dto "github.com/prometheus/client_model/go"
-
 	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // ValueType is an enumeration of metric types that represent a simple value.

Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go

@@ -16,12 +16,11 @@ package text
 import (
 	"bytes"
 	"compress/gzip"
+	"github.com/matttproud/golang_protobuf_extensions/ext"
+	dto "github.com/prometheus/client_model/go"
 	"io"
 	"io/ioutil"
 	"testing"
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/matttproud/golang_protobuf_extensions/ext"
 )
 
 // Benchmarks to show how much penalty text format parsing actually inflicts.

Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go

@@ -22,10 +22,9 @@ import (
 	"strconv"
 	"strings"
 
-	dto "github.com/prometheus/client_model/go"
-
 	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A stateFn is a function that represents a state in a state machine. By

Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go

@@ -19,7 +19,6 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/matttproud/golang_protobuf_extensions/ext"
-
 	dto "github.com/prometheus/client_model/go"
 )