| Index: state/apiserver/watcher.go |
| === modified file 'state/apiserver/watcher.go' |
| --- state/apiserver/watcher.go 2013-05-24 19:03:39 +0000 |
| +++ state/apiserver/watcher.go 2013-06-05 10:23:38 +0000 |
| @@ -6,6 +6,7 @@ |
| import ( |
| "launchpad.net/juju-core/state" |
| "launchpad.net/juju-core/state/api/params" |
| + "launchpad.net/juju-core/state/apiserver/common" |
| "launchpad.net/juju-core/state/multiwatcher" |
| ) |
| @@ -38,7 +39,7 @@ |
| } |
| err := watcher.Err() |
| if err == nil { |
| - err = errStoppedWatcher |
| + err = common.ErrStoppedWatcher |
| } |
| return err |
| } |
| @@ -61,7 +62,7 @@ |
| } |
| err := watcher.Err() |
| if err == nil { |
| - err = errStoppedWatcher |
| + err = common.ErrStoppedWatcher |
| } |
| return params.LifecycleWatchResults{}, err |
| } |
| @@ -84,7 +85,7 @@ |
| } |
| err := watcher.Err() |
| if err == nil { |
| - err = errStoppedWatcher |
| + err = common.ErrStoppedWatcher |
| } |
| return params.EnvironConfigWatchResults{}, err |
| } |
