Re-rewrite import paths.

Another run of 'godep save' fixed the import path.

So you first have to run 'godep update <packages>' and then a 'godep save'.

Let's see if this satisfies Travis.
This commit is contained in:
beorn7 2015-02-26 22:08:45 +01:00
parent 08acf744f7
commit f74f7f2fb1
25 changed files with 42 additions and 42 deletions

View file

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

View file

@ -17,7 +17,7 @@ import (
"math" "math"
"testing" "testing"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
func TestCounterAdd(t *testing.T) { func TestCounterAdd(t *testing.T) {

View file

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

View file

@ -16,9 +16,9 @@ package prometheus_test
import ( import (
"runtime" "runtime"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go"
) )
func NewCallbackMetric(desc *prometheus.Desc, callback func() float64) *CallbackMetric { func NewCallbackMetric(desc *prometheus.Desc, callback func() float64) *CallbackMetric {

View file

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

View file

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

View file

@ -20,7 +20,7 @@ import (
"testing" "testing"
"testing/quick" "testing/quick"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
func listenGaugeStream(vals, result chan float64, done chan struct{}) { func listenGaugeStream(vals, result chan float64, done chan struct{}) {

View file

@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
func TestGoCollector(t *testing.T) { func TestGoCollector(t *testing.T) {

View file

@ -20,9 +20,9 @@ import (
"sort" "sort"
"sync/atomic" "sync/atomic"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
dto "github.com/prometheus/client_model/go"
) )
// A Histogram counts individual observations from an event or sample stream in // A Histogram counts individual observations from an event or sample stream in

View file

@ -22,7 +22,7 @@ import (
"testing" "testing"
"testing/quick" "testing/quick"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
func benchmarkHistogramObserve(w int, b *testing.B) { func benchmarkHistogramObserve(w int, b *testing.B) {

View file

@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
type respBody string type respBody string

View file

@ -16,7 +16,7 @@ package prometheus
import ( import (
"strings" "strings"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
// A Metric models a single sample value with its meta data being exported to // A Metric models a single sample value with its meta data being exported to

View file

@ -15,7 +15,7 @@
package prometheus package prometheus
import "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs" import "github.com/prometheus/procfs"
func processCollectSupported() bool { func processCollectSupported() bool {
if _, err := procfs.NewStat(); err == nil { if _, err := procfs.NewStat(); err == nil {

View file

@ -8,7 +8,7 @@ import (
"regexp" "regexp"
"testing" "testing"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs" "github.com/prometheus/procfs"
) )
func TestProcessCollector(t *testing.T) { func TestProcessCollector(t *testing.T) {

View file

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

View file

@ -25,8 +25,8 @@ import (
"net/http" "net/http"
"testing" "testing"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
type fakeResponseWriter struct { type fakeResponseWriter struct {

View file

@ -20,10 +20,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/beorn7/perks/quantile" "github.com/beorn7/perks/quantile"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model" "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 // A Summary captures individual observations from an event or sample stream and

View file

@ -22,7 +22,7 @@ import (
"testing/quick" "testing/quick"
"time" "time"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
func benchmarkSummaryObserve(w int, b *testing.B) { func benchmarkSummaryObserve(w int, b *testing.B) {

View file

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

View file

@ -16,8 +16,8 @@ package text
import ( import (
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext" "github.com/matttproud/golang_protobuf_extensions/ext"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
"io" "io"
"io/ioutil" "io/ioutil"
"testing" "testing"

View file

@ -27,8 +27,8 @@ import (
"math" "math"
"strings" "strings"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
dto "github.com/prometheus/client_model/go"
) )
// MetricFamilyToText converts a MetricFamily proto message into text format and // MetricFamilyToText converts a MetricFamily proto message into text format and

View file

@ -19,8 +19,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
func testCreate(t testing.TB) { func testCreate(t testing.TB) {

View file

@ -22,9 +22,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model" "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 // A stateFn is a function that represents a state in a state machine. By

View file

@ -18,8 +18,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
var parser Parser var parser Parser

View file

@ -17,9 +17,9 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext" "github.com/matttproud/golang_protobuf_extensions/ext"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
) )
// WriteProtoDelimited writes the MetricFamily to the writer in delimited // WriteProtoDelimited writes the MetricFamily to the writer in delimited