Merge pull request #6909 from rhatdan/podman

Switch all references to github.com/containers/libpod -> podman

25 files changed, 36 insertions, 36 deletions

diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go
index 53fe8952b..e47b66bb4 100644
--- a/pkg/api/server/handler_api.go
+++ b/pkg/api/server/handler_api.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"runtime"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/utils"
+	"github.com/containers/podman/v2/pkg/api/handlers/utils"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go
index 4aeb7462e..5931c2fc9 100644
--- a/pkg/api/server/register_archive.go
+++ b/pkg/api/server/register_archive.go
@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_auth.go b/pkg/api/server/register_auth.go
index 1bf23d2eb..0eaa83737 100644
--- a/pkg/api/server/register_auth.go
+++ b/pkg/api/server/register_auth.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go
index 18ff2f423..edc1ee3c8 100644
--- a/pkg/api/server/register_containers.go
+++ b/pkg/api/server/register_containers.go
@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_distribution.go b/pkg/api/server/register_distribution.go
index 73ef2e85b..201d380d0 100644
--- a/pkg/api/server/register_distribution.go
+++ b/pkg/api/server/register_distribution.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go
index 72aabe496..4b7c645b0 100644
--- a/pkg/api/server/register_events.go
+++ b/pkg/api/server/register_events.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go
index be6cbf9bc..05fb2aee2 100644
--- a/pkg/api/server/register_exec.go
+++ b/pkg/api/server/register_exec.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_generate.go b/pkg/api/server/register_generate.go
index a1ab3f727..7db8ee387 100644
--- a/pkg/api/server/register_generate.go
+++ b/pkg/api/server/register_generate.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_healthcheck.go b/pkg/api/server/register_healthcheck.go
index 9059fdba7..8c9876232 100644
--- a/pkg/api/server/register_healthcheck.go
+++ b/pkg/api/server/register_healthcheck.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index 3c15c82d5..7f060d098 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_info.go b/pkg/api/server/register_info.go
index 28e7e6e53..a1dc9511d 100644
--- a/pkg/api/server/register_info.go
+++ b/pkg/api/server/register_info.go
@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_manifest.go b/pkg/api/server/register_manifest.go
index 91e820dca..5e7d94538 100644
--- a/pkg/api/server/register_manifest.go
+++ b/pkg/api/server/register_manifest.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_monitor.go b/pkg/api/server/register_monitor.go
index 9a76ebac2..5db20667e 100644
--- a/pkg/api/server/register_monitor.go
+++ b/pkg/api/server/register_monitor.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go
index 3a45ee458..7918ad4a2 100644
--- a/pkg/api/server/register_networks.go
+++ b/pkg/api/server/register_networks.go
@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_ping.go b/pkg/api/server/register_ping.go
index 70e88ee00..4a8d2c768 100644
--- a/pkg/api/server/register_ping.go
+++ b/pkg/api/server/register_ping.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_play.go b/pkg/api/server/register_play.go
index 049be39de..a96f61099 100644
--- a/pkg/api/server/register_play.go
+++ b/pkg/api/server/register_play.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_plugins.go b/pkg/api/server/register_plugins.go
index c21564b5c..6600c1bbd 100644
--- a/pkg/api/server/register_plugins.go
+++ b/pkg/api/server/register_plugins.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_pods.go b/pkg/api/server/register_pods.go
index d5a286442..105de4ee7 100644
--- a/pkg/api/server/register_pods.go
+++ b/pkg/api/server/register_pods.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_swagger.go b/pkg/api/server/register_swagger.go
index bf68fda3c..4237540f8 100644
--- a/pkg/api/server/register_swagger.go
+++ b/pkg/api/server/register_swagger.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_swarm.go b/pkg/api/server/register_swarm.go
index d1048bb8c..1f3166dcb 100644
--- a/pkg/api/server/register_swarm.go
+++ b/pkg/api/server/register_swarm.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/utils"
+	"github.com/containers/podman/v2/pkg/api/handlers/utils"
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
 )
diff --git a/pkg/api/server/register_system.go b/pkg/api/server/register_system.go
index ef88cda09..524cdecd9 100644
--- a/pkg/api/server/register_system.go
+++ b/pkg/api/server/register_system.go
@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_version.go b/pkg/api/server/register_version.go
index 38d27849c..cf49c0fa9 100644
--- a/pkg/api/server/register_version.go
+++ b/pkg/api/server/register_version.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/register_volumes.go b/pkg/api/server/register_volumes.go
index 72f0f4249..b509a332a 100644
--- a/pkg/api/server/register_volumes.go
+++ b/pkg/api/server/register_volumes.go
@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/containers/libpod/v2/pkg/api/handlers/compat"
-	"github.com/containers/libpod/v2/pkg/api/handlers/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers/compat"
+	"github.com/containers/podman/v2/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 1c6007745..18b48a3f6 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -13,9 +13,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod"
-	"github.com/containers/libpod/v2/pkg/api/handlers"
-	"github.com/containers/libpod/v2/pkg/api/server/idletracker"
+	"github.com/containers/podman/v2/libpod"
+	"github.com/containers/podman/v2/pkg/api/handlers"
+	"github.com/containers/podman/v2/pkg/api/server/idletracker"
 	"github.com/coreos/go-systemd/v22/activation"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
diff --git a/pkg/api/server/swagger.go b/pkg/api/server/swagger.go
index 26e8b22c2..6d349bb7d 100644
--- a/pkg/api/server/swagger.go
+++ b/pkg/api/server/swagger.go
@@ -1,9 +1,9 @@
 package server
 
 import (
-	"github.com/containers/libpod/v2/libpod"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/podman/v2/libpod"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/domain/entities"
 )
 
 // No such image