Merge branch '2.9' into juju-812-remove-connection-reboot-method

sinanawad · Mar 25, 2022 · 72cf7c6 · 72cf7c6
2 parents f4e1648 + fc45e4d
commit 72cf7c6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/api/interface.go b/api/interface.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/juju/juju/api/agent/unitassigner"
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/api/controller/instancepoller"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/proxy"
 	"github.com/juju/juju/rpc/jsoncodec"
@@ -329,6 +328,5 @@ type Connection interface {
 	// will be easy to remove, but until we're using them via manifolds it's
 	// prohibitively ugly to do so.
 	Client() *Client
-	InstancePoller() *instancepoller.API
 	UnitAssigner() unitassigner.API
 }
diff --git a/api/state.go b/api/state.go
@@ -22,7 +22,6 @@ import (
 	"github.com/juju/juju/api/agent/keyupdater"
 	"github.com/juju/juju/api/agent/unitassigner"
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/api/controller/instancepoller"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/feature"
 	"github.com/juju/juju/rpc"
@@ -322,11 +321,6 @@ func (st *state) KeyUpdater() *keyupdater.State {
 	return keyupdater.NewState(st)
 }
 
-// InstancePoller returns access to the InstancePoller API
-func (st *state) InstancePoller() *instancepoller.API {
-	return instancepoller.NewAPI(st)
-}
-
 // ServerVersion holds the version of the API server that we are connected to.
 // It is possible that this version is Zero if the server does not report this
 // during login. The second result argument indicates if the version number is

diff --git a/cmd/containeragent/initialize/package_test.go b/cmd/containeragent/initialize/package_test.go
@@ -37,7 +37,6 @@ func (*importSuite) TestImports(c *gc.C) {
 		"api/agent/caasapplication",
 		"api/common",
 		"api/common/cloudspec",
-		"api/controller/instancepoller",
 		"api/agent/keyupdater",
 		"api/agent/unitassigner",
 		"api/watcher",