Browse Source

Update logrus to v1.0.1

Fix case sensitivity issue
Update docker and runc vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Derek McGowan 8 years ago
parent
commit
710e0664c4
100 changed files with 100 additions and 100 deletions
  1. 1 1
      libnetwork/agent.go
  2. 1 1
      libnetwork/bitseq/sequence.go
  3. 1 1
      libnetwork/cmd/dnet/dnet.go
  4. 1 1
      libnetwork/cmd/dnet/dnet_windows.go
  5. 1 1
      libnetwork/cmd/dnet/flags.go
  6. 1 1
      libnetwork/config/config.go
  7. 1 1
      libnetwork/controller.go
  8. 1 1
      libnetwork/default_gateway.go
  9. 1 1
      libnetwork/diagnose/diagnose.go
  10. 1 1
      libnetwork/drivers/bridge/bridge.go
  11. 1 1
      libnetwork/drivers/bridge/bridge_store.go
  12. 1 1
      libnetwork/drivers/bridge/interface.go
  13. 1 1
      libnetwork/drivers/bridge/link.go
  14. 1 1
      libnetwork/drivers/bridge/port_mapping.go
  15. 1 1
      libnetwork/drivers/bridge/setup_bridgenetfiltering.go
  16. 1 1
      libnetwork/drivers/bridge/setup_device.go
  17. 1 1
      libnetwork/drivers/bridge/setup_ip_forwarding.go
  18. 1 1
      libnetwork/drivers/bridge/setup_ip_tables.go
  19. 1 1
      libnetwork/drivers/bridge/setup_ipv4.go
  20. 1 1
      libnetwork/drivers/bridge/setup_ipv6.go
  21. 1 1
      libnetwork/drivers/bridge/setup_verify.go
  22. 1 1
      libnetwork/drivers/ipvlan/ipvlan_endpoint.go
  23. 1 1
      libnetwork/drivers/ipvlan/ipvlan_joinleave.go
  24. 1 1
      libnetwork/drivers/ipvlan/ipvlan_network.go
  25. 1 1
      libnetwork/drivers/ipvlan/ipvlan_setup.go
  26. 1 1
      libnetwork/drivers/ipvlan/ipvlan_state.go
  27. 1 1
      libnetwork/drivers/ipvlan/ipvlan_store.go
  28. 1 1
      libnetwork/drivers/macvlan/macvlan_endpoint.go
  29. 1 1
      libnetwork/drivers/macvlan/macvlan_joinleave.go
  30. 1 1
      libnetwork/drivers/macvlan/macvlan_network.go
  31. 1 1
      libnetwork/drivers/macvlan/macvlan_setup.go
  32. 1 1
      libnetwork/drivers/macvlan/macvlan_state.go
  33. 1 1
      libnetwork/drivers/macvlan/macvlan_store.go
  34. 1 1
      libnetwork/drivers/overlay/encryption.go
  35. 1 1
      libnetwork/drivers/overlay/filter.go
  36. 1 1
      libnetwork/drivers/overlay/joinleave.go
  37. 1 1
      libnetwork/drivers/overlay/ostweaks_linux.go
  38. 1 1
      libnetwork/drivers/overlay/ov_endpoint.go
  39. 1 1
      libnetwork/drivers/overlay/ov_network.go
  40. 1 1
      libnetwork/drivers/overlay/ov_serf.go
  41. 1 1
      libnetwork/drivers/overlay/ov_utils.go
  42. 1 1
      libnetwork/drivers/overlay/overlay.go
  43. 1 1
      libnetwork/drivers/overlay/ovmanager/ovmanager.go
  44. 1 1
      libnetwork/drivers/overlay/peerdb.go
  45. 1 1
      libnetwork/drivers/remote/driver.go
  46. 1 1
      libnetwork/drivers/solaris/bridge/bridge.go
  47. 1 1
      libnetwork/drivers/solaris/bridge/bridge_store.go
  48. 1 1
      libnetwork/drivers/solaris/bridge/port_mapping.go
  49. 1 1
      libnetwork/drivers/solaris/overlay/encryption.go
  50. 1 1
      libnetwork/drivers/solaris/overlay/joinleave.go
  51. 1 1
      libnetwork/drivers/solaris/overlay/ov_endpoint.go
  52. 1 1
      libnetwork/drivers/solaris/overlay/ov_network.go
  53. 1 1
      libnetwork/drivers/solaris/overlay/ov_serf.go
  54. 1 1
      libnetwork/drivers/solaris/overlay/overlay.go
  55. 1 1
      libnetwork/drivers/solaris/overlay/ovmanager/ovmanager.go
  56. 1 1
      libnetwork/drivers/solaris/overlay/peerdb.go
  57. 1 1
      libnetwork/drivers/windows/overlay/joinleave_windows.go
  58. 1 1
      libnetwork/drivers/windows/overlay/ov_endpoint_windows.go
  59. 1 1
      libnetwork/drivers/windows/overlay/ov_network_windows.go
  60. 1 1
      libnetwork/drivers/windows/overlay/overlay_windows.go
  61. 1 1
      libnetwork/drivers/windows/overlay/peerdb_windows.go
  62. 1 1
      libnetwork/drivers/windows/windows.go
  63. 1 1
      libnetwork/drivers/windows/windows_store.go
  64. 1 1
      libnetwork/endpoint.go
  65. 1 1
      libnetwork/firewall_linux.go
  66. 1 1
      libnetwork/hostdiscovery/hostdiscovery.go
  67. 1 1
      libnetwork/ipam/allocator.go
  68. 1 1
      libnetwork/ipam/store.go
  69. 1 1
      libnetwork/ipams/remote/remote.go
  70. 1 1
      libnetwork/ipams/windowsipam/windowsipam.go
  71. 1 1
      libnetwork/iptables/conntrack.go
  72. 1 1
      libnetwork/iptables/firewalld.go
  73. 1 1
      libnetwork/iptables/iptables.go
  74. 1 1
      libnetwork/ipvs/netlink.go
  75. 1 1
      libnetwork/libnetwork_linux_test.go
  76. 1 1
      libnetwork/libnetwork_test.go
  77. 1 1
      libnetwork/network.go
  78. 1 1
      libnetwork/network_windows.go
  79. 1 1
      libnetwork/networkdb/cluster.go
  80. 1 1
      libnetwork/networkdb/delegate.go
  81. 1 1
      libnetwork/networkdb/event_delegate.go
  82. 1 1
      libnetwork/networkdb/networkdb.go
  83. 1 1
      libnetwork/networkdb/networkdb_test.go
  84. 1 1
      libnetwork/ns/init_linux.go
  85. 1 1
      libnetwork/osl/interface_linux.go
  86. 1 1
      libnetwork/osl/namespace_linux.go
  87. 1 1
      libnetwork/osl/neigh_linux.go
  88. 1 1
      libnetwork/portmapper/mapper.go
  89. 1 1
      libnetwork/resolvconf/resolvconf.go
  90. 1 1
      libnetwork/resolver.go
  91. 1 1
      libnetwork/resolver_unix.go
  92. 1 1
      libnetwork/sandbox.go
  93. 1 1
      libnetwork/sandbox_dns_unix.go
  94. 1 1
      libnetwork/sandbox_externalkey_unix.go
  95. 1 1
      libnetwork/sandbox_store.go
  96. 1 1
      libnetwork/service_common.go
  97. 1 1
      libnetwork/service_linux.go
  98. 1 1
      libnetwork/store.go
  99. 1 1
      libnetwork/test/networkDb/dbclient/ndbClient.go
  100. 1 1
      libnetwork/test/networkDb/dbserver/ndbServer.go

+ 1 - 1
libnetwork/agent.go

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

+ 1 - 1
libnetwork/bitseq/sequence.go

@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"fmt"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // block sequence constants
 // block sequence constants

+ 1 - 1
libnetwork/cmd/dnet/dnet.go

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

+ 1 - 1
libnetwork/cmd/dnet/dnet_windows.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"os"
 	"syscall"
 	"syscall"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/pkg/system"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Copied over from docker/daemon/debugtrap_windows.go
 // Copied over from docker/daemon/debugtrap_windows.go

+ 1 - 1
libnetwork/cmd/dnet/flags.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
 	"github.com/codegangsta/cli"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var (
 var (

+ 1 - 1
libnetwork/config/config.go

@@ -4,7 +4,6 @@ import (
 	"strings"
 	"strings"
 
 
 	"github.com/BurntSushi/toml"
 	"github.com/BurntSushi/toml"
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/discovery"
 	"github.com/docker/docker/pkg/discovery"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/docker/go-connections/tlsconfig"
@@ -13,6 +12,7 @@ import (
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Config encapsulates configurations of various Libnetwork components
 // Config encapsulates configurations of various Libnetwork components

+ 1 - 1
libnetwork/controller.go

@@ -52,7 +52,6 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/discovery"
 	"github.com/docker/docker/pkg/discovery"
 	"github.com/docker/docker/pkg/locker"
 	"github.com/docker/docker/pkg/locker"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/plugingetter"
@@ -69,6 +68,7 @@ import (
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // NetworkController provides the interface for controller instance which manages
 // NetworkController provides the interface for controller instance which manages

+ 1 - 1
libnetwork/default_gateway.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"fmt"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/diagnose/diagnose.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/http"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // HTTPHandlerFunc TODO
 // HTTPHandlerFunc TODO

+ 1 - 1
libnetwork/drivers/bridge/bridge.go

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

+ 1 - 1
libnetwork/drivers/bridge/bridge_store.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/bridge/interface.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/bridge/link.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type link struct {
 type link struct {

+ 1 - 1
libnetwork/drivers/bridge/port_mapping.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var (
 var (

+ 1 - 1
libnetwork/drivers/bridge/setup_bridgenetfiltering.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"os"
 	"syscall"
 	"syscall"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Enumeration type saying which versions of IP protocol to process.
 // Enumeration type saying which versions of IP protocol to process.

+ 1 - 1
libnetwork/drivers/bridge/setup_device.go

@@ -3,9 +3,9 @@ package bridge
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/bridge/setup_ip_forwarding.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"fmt"
 	"io/ioutil"
 	"io/ioutil"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/bridge/setup_ip_tables.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/bridge/setup_ipv4.go

@@ -7,8 +7,8 @@ import (
 	"net"
 	"net"
 	"path/filepath"
 	"path/filepath"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/bridge/setup_ipv6.go

@@ -6,8 +6,8 @@ import (
 	"net"
 	"net"
 	"os"
 	"os"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/bridge/setup_verify.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"fmt"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/ipvlan/ipvlan_endpoint.go

@@ -3,12 +3,12 @@ package ipvlan
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // CreateEndpoint assigns the mac, ip and endpoint id for the new container
 // CreateEndpoint assigns the mac, ip and endpoint id for the new container

+ 1 - 1
libnetwork/drivers/ipvlan/ipvlan_joinleave.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type staticRoute struct {
 type staticRoute struct {

+ 1 - 1
libnetwork/drivers/ipvlan/ipvlan_network.go

@@ -3,7 +3,6 @@ package ipvlan
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
@@ -12,6 +11,7 @@ import (
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // CreateNetwork the network for the specified driver type
 // CreateNetwork the network for the specified driver type

+ 1 - 1
libnetwork/drivers/ipvlan/ipvlan_setup.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/ipvlan/ipvlan_state.go

@@ -3,9 +3,9 @@ package ipvlan
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 func (d *driver) network(nid string) *network {
 func (d *driver) network(nid string) *network {

+ 1 - 1
libnetwork/drivers/ipvlan/ipvlan_store.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/macvlan/macvlan_endpoint.go

@@ -3,13 +3,13 @@ package macvlan
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // CreateEndpoint assigns the mac, ip and endpoint id for the new container
 // CreateEndpoint assigns the mac, ip and endpoint id for the new container

+ 1 - 1
libnetwork/drivers/macvlan/macvlan_joinleave.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
 // Join method is invoked when a Sandbox is attached to an endpoint.

+ 1 - 1
libnetwork/drivers/macvlan/macvlan_network.go

@@ -3,7 +3,6 @@ package macvlan
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
@@ -12,6 +11,7 @@ import (
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // CreateNetwork the network for the specified driver type
 // CreateNetwork the network for the specified driver type

+ 1 - 1
libnetwork/drivers/macvlan/macvlan_setup.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/macvlan/macvlan_state.go

@@ -3,9 +3,9 @@ package macvlan
 import (
 import (
 	"fmt"
 	"fmt"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 func (d *driver) network(nid string) *network {
 func (d *driver) network(nid string) *network {

+ 1 - 1
libnetwork/drivers/macvlan/macvlan_store.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/overlay/encryption.go

@@ -12,10 +12,10 @@ import (
 
 
 	"strconv"
 	"strconv"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/drivers/overlay/filter.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"fmt"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const globalChain = "DOCKER-OVERLAY"
 const globalChain = "DOCKER-OVERLAY"

+ 1 - 1
libnetwork/drivers/overlay/joinleave.go

@@ -5,11 +5,11 @@ import (
 	"net"
 	"net"
 	"syscall"
 	"syscall"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/proto"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
 // Join method is invoked when a Sandbox is attached to an endpoint.

+ 1 - 1
libnetwork/drivers/overlay/ostweaks_linux.go

@@ -5,7 +5,7 @@ import (
 	"path"
 	"path"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var sysctlConf = map[string]string{
 var sysctlConf = map[string]string{

+ 1 - 1
libnetwork/drivers/overlay/ov_endpoint.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type endpointTable map[string]*endpoint
 type endpointTable map[string]*endpoint

+ 1 - 1
libnetwork/drivers/overlay/ov_network.go

@@ -14,7 +14,6 @@ import (
 	"syscall"
 	"syscall"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
@@ -24,6 +23,7 @@ import (
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink/nl"
 	"github.com/vishvananda/netlink/nl"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"

+ 1 - 1
libnetwork/drivers/overlay/ov_serf.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/hashicorp/serf/serf"
 	"github.com/hashicorp/serf/serf"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type ovNotify struct {
 type ovNotify struct {

+ 1 - 1
libnetwork/drivers/overlay/ov_utils.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 	"strings"
 	"syscall"
 	"syscall"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )

+ 1 - 1
libnetwork/drivers/overlay/overlay.go

@@ -8,7 +8,6 @@ import (
 	"net"
 	"net"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
@@ -17,6 +16,7 @@ import (
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/hashicorp/serf/serf"
 	"github.com/hashicorp/serf/serf"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/overlay/ovmanager/ovmanager.go

@@ -7,13 +7,13 @@ import (
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/idm"
 	"github.com/docker/libnetwork/idm"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/overlay/peerdb.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 	"sync"
 	"syscall"
 	"syscall"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/common"
 	"github.com/docker/libnetwork/common"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const ovPeerTable = "overlay_peer_table"
 const ovPeerTable = "overlay_peer_table"

+ 1 - 1
libnetwork/drivers/remote/driver.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/drivers/remote/api"
 	"github.com/docker/libnetwork/drivers/remote/api"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type driver struct {
 type driver struct {

+ 1 - 1
libnetwork/drivers/solaris/bridge/bridge.go

@@ -13,7 +13,6 @@ import (
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
@@ -23,6 +22,7 @@ import (
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/portmapper"
 	"github.com/docker/libnetwork/portmapper"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/solaris/bridge/bridge_store.go

@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/solaris/bridge/port_mapping.go

@@ -10,8 +10,8 @@ import (
 	"os"
 	"os"
 	"os/exec"
 	"os/exec"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var (
 var (

+ 1 - 1
libnetwork/drivers/solaris/overlay/encryption.go

@@ -9,8 +9,8 @@ import (
 	"net"
 	"net"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/solaris/overlay/joinleave.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/proto"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
 // Join method is invoked when a Sandbox is attached to an endpoint.

+ 1 - 1
libnetwork/drivers/solaris/overlay/ov_endpoint.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type endpointTable map[string]*endpoint
 type endpointTable map[string]*endpoint

+ 1 - 1
libnetwork/drivers/solaris/overlay/ov_network.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
@@ -18,6 +17,7 @@ import (
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var (
 var (

+ 1 - 1
libnetwork/drivers/solaris/overlay/ov_serf.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/hashicorp/serf/serf"
 	"github.com/hashicorp/serf/serf"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type ovNotify struct {
 type ovNotify struct {

+ 1 - 1
libnetwork/drivers/solaris/overlay/overlay.go

@@ -7,7 +7,6 @@ import (
 	"net"
 	"net"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
@@ -16,6 +15,7 @@ import (
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/hashicorp/serf/serf"
 	"github.com/hashicorp/serf/serf"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // XXX OVERLAY_SOLARIS
 // XXX OVERLAY_SOLARIS

+ 1 - 1
libnetwork/drivers/solaris/overlay/ovmanager/ovmanager.go

@@ -7,13 +7,13 @@ import (
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/idm"
 	"github.com/docker/libnetwork/idm"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/solaris/overlay/peerdb.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"net"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const ovPeerTable = "overlay_peer_table"
 const ovPeerTable = "overlay_peer_table"

+ 1 - 1
libnetwork/drivers/windows/overlay/joinleave_windows.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/proto"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
 // Join method is invoked when a Sandbox is attached to an endpoint.

+ 1 - 1
libnetwork/drivers/windows/overlay/ov_endpoint_windows.go

@@ -6,8 +6,8 @@ import (
 	"net"
 	"net"
 
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type endpointTable map[string]*endpoint
 type endpointTable map[string]*endpoint

+ 1 - 1
libnetwork/drivers/windows/overlay/ov_network_windows.go

@@ -9,10 +9,10 @@ import (
 	"sync"
 	"sync"
 
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var (
 var (

+ 1 - 1
libnetwork/drivers/windows/overlay/overlay_windows.go

@@ -8,12 +8,12 @@ import (
 	"sync"
 	"sync"
 
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/drivers/windows/overlay/peerdb_windows.go

@@ -6,8 +6,8 @@ import (
 
 
 	"encoding/json"
 	"encoding/json"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/Microsoft/hcsshim"
 )
 )

+ 1 - 1
libnetwork/drivers/windows/windows.go

@@ -20,12 +20,12 @@ import (
 	"sync"
 	"sync"
 
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // networkConfiguration for network specific configuration
 // networkConfiguration for network specific configuration

+ 1 - 1
libnetwork/drivers/windows/windows_store.go

@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/endpoint.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Endpoint represents a logical connection between a network and a sandbox.
 // Endpoint represents a logical connection between a network and a sandbox.

+ 1 - 1
libnetwork/firewall_linux.go

@@ -1,8 +1,8 @@
 package libnetwork
 package libnetwork
 
 
 import (
 import (
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const userChain = "DOCKER-USER"
 const userChain = "DOCKER-USER"

+ 1 - 1
libnetwork/hostdiscovery/hostdiscovery.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"net"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 
 	mapset "github.com/deckarep/golang-set"
 	mapset "github.com/deckarep/golang-set"
 	"github.com/docker/docker/pkg/discovery"
 	"github.com/docker/docker/pkg/discovery"

+ 1 - 1
libnetwork/ipam/allocator.go

@@ -6,13 +6,13 @@ import (
 	"sort"
 	"sort"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/bitseq"
 	"github.com/docker/libnetwork/bitseq"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipamutils"
 	"github.com/docker/libnetwork/ipamutils"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/ipam/store.go

@@ -3,9 +3,9 @@ package ipam
 import (
 import (
 	"encoding/json"
 	"encoding/json"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Key provides the Key to be used in KV Store
 // Key provides the Key to be used in KV Store

+ 1 - 1
libnetwork/ipams/remote/remote.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipams/remote/api"
 	"github.com/docker/libnetwork/ipams/remote/api"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type allocator struct {
 type allocator struct {

+ 1 - 1
libnetwork/ipams/windowsipam/windowsipam.go

@@ -3,11 +3,11 @@ package windowsipam
 import (
 import (
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/discoverapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/iptables/conntrack.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"net"
 	"syscall"
 	"syscall"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/iptables/firewalld.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"fmt"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/godbus/dbus"
 	"github.com/godbus/dbus"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // IPV defines the table string
 // IPV defines the table string

+ 1 - 1
libnetwork/iptables/iptables.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Action signifies the iptable action.
 // Action signifies the iptable action.

+ 1 - 1
libnetwork/ipvs/netlink.go

@@ -14,7 +14,7 @@ import (
 	"syscall"
 	"syscall"
 	"unsafe"
 	"unsafe"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink/nl"
 	"github.com/vishvananda/netlink/nl"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )

+ 1 - 1
libnetwork/libnetwork_linux_test.go

@@ -14,7 +14,6 @@ import (
 	"strings"
 	"strings"
 	"testing"
 	"testing"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork"
 	"github.com/docker/libnetwork"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipamapi"
@@ -25,6 +24,7 @@ import (
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/configs"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )

+ 1 - 1
libnetwork/libnetwork_test.go

@@ -10,7 +10,6 @@ import (
 	"sync"
 	"sync"
 	"testing"
 	"testing"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork"
 	"github.com/docker/libnetwork"
@@ -22,6 +21,7 @@ import (
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/testutils"
 	"github.com/docker/libnetwork/testutils"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )
 
 

+ 1 - 1
libnetwork/network.go

@@ -8,7 +8,6 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/libnetwork/common"
 	"github.com/docker/libnetwork/common"
 	"github.com/docker/libnetwork/config"
 	"github.com/docker/libnetwork/config"
@@ -21,6 +20,7 @@ import (
 	"github.com/docker/libnetwork/networkdb"
 	"github.com/docker/libnetwork/networkdb"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // A Network represents a logical connectivity zone that containers may
 // A Network represents a logical connectivity zone that containers may

+ 1 - 1
libnetwork/network_windows.go

@@ -7,10 +7,10 @@ import (
 	"time"
 	"time"
 
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/drivers/windows"
 	"github.com/docker/libnetwork/drivers/windows"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipamapi"
 	"github.com/docker/libnetwork/ipams/windowsipam"
 	"github.com/docker/libnetwork/ipams/windowsipam"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 func executeInCompartment(compartmentID uint32, x func()) {
 func executeInCompartment(compartmentID uint32, x func()) {

+ 1 - 1
libnetwork/networkdb/cluster.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/hashicorp/memberlist"
 	"github.com/hashicorp/memberlist"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/networkdb/delegate.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"net"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/proto"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type delegate struct {
 type delegate struct {

+ 1 - 1
libnetwork/networkdb/event_delegate.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"encoding/json"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/hashicorp/memberlist"
 	"github.com/hashicorp/memberlist"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type eventDelegate struct {
 type eventDelegate struct {

+ 1 - 1
libnetwork/networkdb/networkdb.go

@@ -10,12 +10,12 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/armon/go-radix"
 	"github.com/armon/go-radix"
 	"github.com/docker/go-events"
 	"github.com/docker/go-events"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/hashicorp/memberlist"
 	"github.com/hashicorp/memberlist"
 	"github.com/hashicorp/serf/serf"
 	"github.com/hashicorp/serf/serf"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/networkdb/networkdb_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 	"testing"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/go-events"
 	"github.com/docker/go-events"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/require"
 )
 )

+ 1 - 1
libnetwork/ns/init_linux.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"syscall"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )

+ 1 - 1
libnetwork/osl/interface_linux.go

@@ -8,9 +8,9 @@ import (
 	"syscall"
 	"syscall"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )

+ 1 - 1
libnetwork/osl/namespace_linux.go

@@ -14,10 +14,10 @@ import (
 	"syscall"
 	"syscall"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )

+ 1 - 1
libnetwork/osl/neigh_linux.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"fmt"
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
 )
 )
 
 

+ 1 - 1
libnetwork/portmapper/mapper.go

@@ -6,9 +6,9 @@ import (
 	"net"
 	"net"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/portallocator"
 	"github.com/docker/libnetwork/portallocator"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 type mapping struct {
 type mapping struct {

+ 1 - 1
libnetwork/resolvconf/resolvconf.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/libnetwork/resolvconf/dns"
 	"github.com/docker/libnetwork/resolvconf/dns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var (
 var (

+ 1 - 1
libnetwork/resolver.go

@@ -8,9 +8,9 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/miekg/dns"
 	"github.com/miekg/dns"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Resolver represents the embedded DNS server in Docker. It operates
 // Resolver represents the embedded DNS server in Docker. It operates

+ 1 - 1
libnetwork/resolver_unix.go

@@ -9,9 +9,9 @@ import (
 	"os/exec"
 	"os/exec"
 	"runtime"
 	"runtime"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )
 
 

+ 1 - 1
libnetwork/sandbox.go

@@ -9,11 +9,11 @@ import (
 	"sync"
 	"sync"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/etchosts"
 	"github.com/docker/libnetwork/etchosts"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 // Sandbox provides the control over the network container entity. It is a one to one mapping with the container.
 // Sandbox provides the control over the network container entity. It is a one to one mapping with the container.

+ 1 - 1
libnetwork/sandbox_dns_unix.go

@@ -11,11 +11,11 @@ import (
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/etchosts"
 	"github.com/docker/libnetwork/etchosts"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/docker/libnetwork/resolvconf/dns"
 	"github.com/docker/libnetwork/resolvconf/dns"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/sandbox_externalkey_unix.go

@@ -10,9 +10,9 @@ import (
 	"net"
 	"net"
 	"os"
 	"os"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/configs"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const udsBase = "/run/docker/libnetwork/"
 const udsBase = "/run/docker/libnetwork/"

+ 1 - 1
libnetwork/sandbox_store.go

@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"encoding/json"
 	"sync"
 	"sync"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/osl"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/service_common.go

@@ -5,8 +5,8 @@ package libnetwork
 import (
 import (
 	"net"
 	"net"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/common"
 	"github.com/docker/libnetwork/common"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 func (c *controller) addEndpointNameResolution(svcName, svcID, nID, eID, containerName string, vip net.IP, serviceAliases, taskAliases []string, ip net.IP, addService bool, method string) error {
 func (c *controller) addEndpointNameResolution(svcName, svcID, nID, eID, containerName string, vip net.IP, serviceAliases, taskAliases []string, ip net.IP, addService bool, method string) error {

+ 1 - 1
libnetwork/service_linux.go

@@ -14,12 +14,12 @@ import (
 	"sync"
 	"sync"
 	"syscall"
 	"syscall"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/ipvs"
 	"github.com/docker/libnetwork/ipvs"
 	"github.com/docker/libnetwork/ns"
 	"github.com/docker/libnetwork/ns"
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/proto"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink/nl"
 	"github.com/vishvananda/netlink/nl"
 	"github.com/vishvananda/netns"
 	"github.com/vishvananda/netns"
 )
 )

+ 1 - 1
libnetwork/store.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"fmt"
 	"strings"
 	"strings"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libkv/store/boltdb"
 	"github.com/docker/libkv/store/boltdb"
 	"github.com/docker/libkv/store/consul"
 	"github.com/docker/libkv/store/consul"
 	"github.com/docker/libkv/store/etcd"
 	"github.com/docker/libkv/store/etcd"
 	"github.com/docker/libkv/store/zookeeper"
 	"github.com/docker/libkv/store/zookeeper"
 	"github.com/docker/libnetwork/datastore"
 	"github.com/docker/libnetwork/datastore"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 func registerKVStores() {
 func registerKVStores() {

+ 1 - 1
libnetwork/test/networkDb/dbclient/ndbClient.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var servicePort string
 var servicePort string

+ 1 - 1
libnetwork/test/networkDb/dbserver/ndbServer.go

@@ -9,10 +9,10 @@ import (
 	"os"
 	"os"
 	"strconv"
 	"strconv"
 
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/diagnose"
 	"github.com/docker/libnetwork/diagnose"
 	"github.com/docker/libnetwork/networkdb"
 	"github.com/docker/libnetwork/networkdb"
 	"github.com/docker/libnetwork/test/networkDb/dummyclient"
 	"github.com/docker/libnetwork/test/networkDb/dummyclient"
+	"github.com/sirupsen/logrus"
 )
 )
 
 
 var nDB *networkdb.NetworkDB
 var nDB *networkdb.NetworkDB

Some files were not shown because too many files changed in this diff