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.

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 logrus to v1.0.1 #1856

Merged
merged 1 commit into from
Aug 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"sort"
"sync"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/go-events"
"github.com/docker/libnetwork/cluster"
Expand All @@ -20,6 +19,7 @@ import (
"github.com/docker/libnetwork/networkdb"
"github.com/docker/libnetwork/types"
"github.com/gogo/protobuf/proto"
"github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion bitseq/sequence.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"fmt"
"sync"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

// block sequence constants
Expand Down
2 changes: 1 addition & 1 deletion cmd/dnet/dnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/docker/docker/pkg/discovery"
"github.com/docker/docker/pkg/reexec"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/pkg/term"
"github.com/docker/libnetwork"
Expand All @@ -36,6 +35,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
"github.com/gorilla/mux"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dnet/dnet_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"syscall"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/signal"
"github.com/docker/docker/pkg/system"
"github.com/sirupsen/logrus"
)

// Copied over from docker/daemon/debugtrap_windows.go
Expand Down
2 changes: 1 addition & 1 deletion cmd/dnet/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
"github.com/sirupsen/logrus"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"strings"

"github.com/BurntSushi/toml"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/discovery"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/go-connections/tlsconfig"
Expand All @@ -13,6 +12,7 @@ import (
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/osl"
"github.com/sirupsen/logrus"
)

// Config encapsulates configurations of various Libnetwork components
Expand Down
2 changes: 1 addition & 1 deletion controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ import (
"sync"
"time"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/discovery"
"github.com/docker/docker/pkg/locker"
"github.com/docker/docker/pkg/plugingetter"
Expand All @@ -69,6 +68,7 @@ import (
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

// NetworkController provides the interface for controller instance which manages
Expand Down
2 changes: 1 addition & 1 deletion default_gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion diagnose/diagnose.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sync"

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

// HTTPHandlerFunc TODO
Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"sync"
"syscall"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
Expand All @@ -24,6 +23,7 @@ import (
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/portmapper"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/bridge_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/link.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

type link struct {
Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/port_mapping.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/setup_bridgenetfiltering.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"syscall"

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

// Enumeration type saying which versions of IP protocol to process.
Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/setup_device.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package bridge
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/libnetwork/netutils"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/setup_ip_forwarding.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"io/ioutil"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/setup_ip_tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/setup_ipv4.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net"
"path/filepath"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/setup_ipv6.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net"
"os"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/bridge/setup_verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/ipvlan/ipvlan_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package ipvlan
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

// CreateEndpoint assigns the mac, ip and endpoint id for the new container
Expand Down
2 changes: 1 addition & 1 deletion drivers/ipvlan/ipvlan_joinleave.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

type staticRoute struct {
Expand Down
2 changes: 1 addition & 1 deletion drivers/ipvlan/ipvlan_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package ipvlan
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/libnetwork/driverapi"
Expand All @@ -12,6 +11,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

// CreateNetwork the network for the specified driver type
Expand Down
2 changes: 1 addition & 1 deletion drivers/ipvlan/ipvlan_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strconv"
"strings"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/ns"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/ipvlan/ipvlan_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package ipvlan
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

func (d *driver) network(nid string) *network {
Expand Down
2 changes: 1 addition & 1 deletion drivers/ipvlan/ipvlan_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion drivers/macvlan/macvlan_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package macvlan
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

// CreateEndpoint assigns the mac, ip and endpoint id for the new container
Expand Down
2 changes: 1 addition & 1 deletion drivers/macvlan/macvlan_joinleave.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"net"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/sirupsen/logrus"
)

// Join method is invoked when a Sandbox is attached to an endpoint.
Expand Down
2 changes: 1 addition & 1 deletion drivers/macvlan/macvlan_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package macvlan
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/libnetwork/driverapi"
Expand All @@ -12,6 +11,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

// CreateNetwork the network for the specified driver type
Expand Down
2 changes: 1 addition & 1 deletion drivers/macvlan/macvlan_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strconv"
"strings"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/ns"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/macvlan/macvlan_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package macvlan
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

func (d *driver) network(nid string) *network {
Expand Down
Loading