Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the import for logrus to use the updated username #40

Merged
merged 1 commit into from
Aug 1, 2017
Merged

Update the import for logrus to use the updated username #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion check-licenses/check_licenses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"os"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"bufio"
"regexp"
Expand Down
2 changes: 1 addition & 1 deletion cmd/typha-client/typha-client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"math/rand"
"runtime"
Expand Down
2 changes: 1 addition & 1 deletion fv-tests/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

log "github.com/Sirupsen/logrus"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
Expand Down
12 changes: 6 additions & 6 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import:
- package: github.com/go-ini/ini
version: ^1.21.0
- package: github.com/projectcalico/libcalico-go
version: ^v1.5.0
version: 93f9e49214a678551648eb9c28ce57bc286a3169
subpackages:
- lib
- package: github.com/Sirupsen/logrus
- package: github.com/sirupsen/logrus
version: ^0.11.5
- package: github.com/kardianos/osext
- package: github.com/mipearson/rfw
Expand Down
2 changes: 1 addition & 1 deletion pkg/calc/async_decoupler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package calc
import (
"context"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/backend/api"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/calc/validation_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"errors"
"reflect"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strconv"
"strings"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"time"

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/env_var_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package config
import (
"strings"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

// LoadConfigFromEnvironment extracts raw config parameters (identified by
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/file_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"io/ioutil"
"os"

log "github.com/Sirupsen/logrus"
"github.com/go-ini/ini"
log "github.com/sirupsen/logrus"
)

func LoadConfigFile(filename string) (map[string]string, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/param_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (

"time"

log "github.com/Sirupsen/logrus"
"github.com/kardianos/osext"
log "github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"syscall"
"time"

log "github.com/Sirupsen/logrus"
docopt "github.com/docopt/docopt-go"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/api"
"github.com/projectcalico/libcalico-go/lib/backend"
Expand Down
2 changes: 1 addition & 1 deletion pkg/jitter/jittered_ticker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"math/rand"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

// Ticker tries to emit events on channel C at minDuration intervals plus up to maxJitter.
Expand Down
2 changes: 1 addition & 1 deletion pkg/jitter/jittered_ticker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"
"time"

"github.com/Sirupsen/logrus"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/sirupsen/logrus"
)

var _ = Describe("Real 20ms + 10ms Ticker", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/lookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package k8s

import (
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/rebalance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package k8s

import (
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"context"
"time"
Expand Down
2 changes: 1 addition & 1 deletion pkg/logutils/logutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"sync"
"time"

log "github.com/Sirupsen/logrus"
"github.com/mipearson/rfw"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/typha/pkg/config"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/logutils/logutils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"strings"
"time"

log "github.com/Sirupsen/logrus"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
log "github.com/sirupsen/logrus"

"sync"

Expand Down
2 changes: 1 addition & 1 deletion pkg/snapcache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"time"
"unsafe"

log "github.com/Sirupsen/logrus"
"github.com/Workiva/go-datastructures/trie/ctrie"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/health"
Expand Down
2 changes: 1 addition & 1 deletion pkg/snapcache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"sync"
"time"

log "github.com/Sirupsen/logrus"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
Expand Down
2 changes: 1 addition & 1 deletion pkg/syncclient/sync_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/typha/pkg/syncproto"
Expand Down
2 changes: 1 addition & 1 deletion pkg/syncproto/sync_proto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
Expand Down
2 changes: 1 addition & 1 deletion pkg/syncserver/sync_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"sync"
"time"

log "github.com/Sirupsen/logrus"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"math"

Expand Down