lp://staging/~dimitern/juju-core/137-fix-state-imports

cert/cert_test.go (+1/-1)
cmd/builddb/main.go (+1/-3)
cmd/charmload/main.go (+5/-3)
cmd/juju/addmachine_test.go (+3/-1)
cmd/juju/addrelation_test.go (+1/-0)
cmd/juju/addunit_test.go (+1/-0)
cmd/juju/cmd_test.go (+2/-2)
cmd/juju/constraints_test.go (+2/-0)
cmd/juju/deploy_test.go (+3/-2)
cmd/juju/destroymachine_test.go (+1/-0)
cmd/juju/destroyrelation_test.go (+1/-0)
cmd/juju/destroyservice_test.go (+1/-0)
cmd/juju/destroyunit_test.go (+1/-0)
cmd/juju/endpoint.go (+1/-0)
cmd/juju/expose_test.go (+1/-0)
cmd/juju/helptool_test.go (+1/-0)
cmd/juju/plugin_test.go (+6/-5)
cmd/juju/publish_test.go (+3/-1)
cmd/juju/resolved_test.go (+1/-0)
cmd/juju/scp_test.go (+3/-1)
cmd/juju/ssh_test.go (+5/-3)
cmd/juju/switch.go (+1/-0)
cmd/juju/switch_test.go (+1/-0)
cmd/juju/unexpose_test.go (+1/-0)
cmd/juju/upgradecharm_test.go (+4/-2)
cmd/jujud/main.go (+1/-3)
cmd/jujud/main_test.go (+7/-5)
cmd/plugins/juju-metadata/metadataplugin_test.go (+1/-1)
environs/cloudinit/suite_test.go (+2/-1)
environs/config/home_test.go (+2/-1)
environs/instances/image_test.go (+2/-2)
environs/jujutest/jujutest_test.go (+2/-1)
environs/jujutest/livetests.go (+171/-170)
environs/jujutest/metadata_test.go (+2/-1)
environs/jujutest/tests.go (+65/-65)
environs/localstorage/backend_test.go (+2/-1)
environs/simplestreams/datasource.go (+1/-1)
environs/simplestreams/decode.go (+3/-2)
environs/storage.go (+2/-1)
environs/testing/tools.go (+14/-14)
environs/tools/simplestreams.go (+1/-1)
environs/tools/testing/testing.go (+1/-1)
instance/instance_test.go (+1/-0)
juju/conn_test.go (+2/-2)
juju/testing/repo.go (+30/-28)
log/syslog/config_test.go (+4/-2)
names/environ.go (+3/-1)
names/user.go (+3/-1)
provider/azure/environprovider.go (+3/-1)
provider/azure/storage.go (+1/-0)
provider/ec2/config.go (+2/-0)
provider/ec2/export_test.go (+1/-0)
provider/ec2/instancetype.go (+1/-0)
provider/ec2/suite_test.go (+2/-1)
provider/openstack/config.go (+3/-1)
provider/openstack/live_test.go (+3/-0)
provider/provider_test.go (+2/-1)
rpc/jsoncodec/codec.go (+3/-2)
rpc/jsoncodec/codec_test.go (+5/-3)
rpc/jsoncodec/conn.go (+2/-1)
state/api/agent/state.go (+0/-2)
state/api/apiclient.go (+4/-2)
state/api/params/params.go (+1/-0)
state/api/params/params_test.go (+3/-1)
state/api/watcher/watcher.go (+4/-2)
state/apiserver/admin.go (+2/-1)
state/apiserver/apiserver.go (+8/-6)
state/apiserver/client/api_test.go (+6/-4)
state/apiserver/client/client_test.go (+5/-3)
state/apiserver/common/resource.go (+2/-1)
state/apiserver/login_test.go (+1/-0)
state/apiserver/utils.go (+1/-0)
state/charm_test.go (+2/-2)
state/initialize_test.go (+4/-4)
state/machine_test.go (+8/-8)
state/multiwatcher/multiwatcher.go (+4/-2)
state/multiwatcher/multiwatcher_internal_test.go (+5/-3)
state/presence/presence.go (+6/-4)
state/presence/presence_test.go (+6/-4)
state/relation.go (+1/-1)
state/relation_test.go (+7/-7)
state/relationunit.go (+1/-1)
state/service_test.go (+15/-15)
state/settings_test.go (+3/-4)
state/statecmd/addrelation_test.go (+1/-0)
state/statecmd/destroyrelation_test.go (+5/-4)
state/statecmd/destroyservice_test.go (+1/-0)
state/statecmd/expose_test.go (+1/-0)
state/statecmd/unexpose_test.go (+1/-0)
state/unit.go (+0/-1)
state/unit_test.go (+8/-8)
state/watcher/helpers_test.go (+3/-1)
state/watcher/watcher.go (+4/-2)
state/watcher/watcher_test.go (+5/-3)
store/mgo_test.go (+1/-0)
testing/checkers/bool.go (+8/-8)
testing/checkers/bool_test.go (+12/-10)
testing/checkers/checker.go (+19/-19)
testing/checkers/file.go (+10/-10)
testing/checkers/file_test.go (+21/-20)
testing/checkers/relop.go (+7/-7)
testing/checkers/relop_test.go (+14/-13)
testing/checkers/set_test.go (+1/-0)
testing/cmd.go (+8/-8)
testing/environ.go (+20/-20)
testing/git.go (+3/-3)
testing/http.go (+7/-7)
testing/instance.go (+3/-3)
testing/log_test.go (+1/-0)
testing/mgo.go (+6/-6)
tools/list.go (+1/-1)
utils/attempt_test.go (+3/-1)
utils/fslock/fslock_test.go (+2/-1)
utils/set/strings_test.go (+4/-2)
utils/uuid_test.go (+2/-2)
worker/deployer/simple_test.go (+2/-2)
worker/firewaller/firewaller.go (+3/-1)
worker/provisioner/provisioner_test.go (+2/-2)
worker/resumer/resumer.go (+4/-2)
worker/resumer/resumer_test.go (+1/-0)
worker/uniter/charm/charm_test.go (+2/-2)
worker/uniter/jujuc/ports_test.go (+1/-0)
worker/uniter/jujuc/server_test.go (+2/-2)
worker/uniter/relation/relation_test.go (+5/-5)
worker/uniter/relationer_test.go (+5/-5)