← Back to branch summary

~dave-cheney/juju-core/044-environs-respect-default-series

~dave-cheney/juju-core/044-environs-respect-default-series

« back to all changes in this revision

Viewing changes to state/service.go

Committer: Dave Cheney
Date: 2012-11-30 01:35:02 UTC
mfrom: (713.2.47 juju-core)
Revision ID: david.cheney@canonical.com-20121130013502-x6megsp5pf55rf0a

merge from trunk

files added:
CONTRIBUTING

README

cert

cert/cert.go

cert/cert_test.go

environs/bootstrap.go

environs/bootstrap_test.go

environs/ec2/testdata/query/quantal/server/released.current.txt

environs/openstack

environs/openstack/config.go

environs/openstack/config_test.go

environs/openstack/export_test.go

environs/openstack/local_test.go

environs/openstack/provider.go

environs/openstack/testdata

environs/openstack/testdata/2011-01-01

environs/openstack/testdata/2011-01-01/meta-data

environs/openstack/testdata/2011-01-01/meta-data/local-hostname

environs/openstack/testdata/2011-01-01/meta-data/public-hostname

testing/cert.go

files removed:
cmd/juju/export_test.go

state/ssh.go

state/ssh_test.go

files modified:
.lbox.check

cmd/builddb/main.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/cmd_test.go

cmd/juju/main_test.go

cmd/juju/scp.go

cmd/juju/ssh.go

cmd/juju/ssh_test.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/jujud/agent.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/main_test.go

container/container.go

container/container_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/config.go

environs/config/authkeys.go

environs/config/config.go

environs/config/config_test.go

environs/config_test.go

environs/dummy/config_test.go

environs/dummy/environs.go

environs/dummy/environs_test.go

environs/ec2/config.go

environs/ec2/config_test.go

environs/ec2/ec2.go

environs/ec2/export_test.go

environs/ec2/live_test.go

environs/ec2/local_test.go

environs/ec2/state.go

environs/ec2/testdata/query/quantal/server/daily.current.txt

environs/interface.go

environs/jujutest/livetests.go

environs/jujutest/tests.go

environs/open_test.go

environs/tools.go

environs/tools_test.go

juju/conn.go

juju/conn_test.go

juju/testing/conn.go

state/assign_test.go

state/conn_test.go

state/export_test.go

state/machine.go

state/machine_test.go

state/open.go

state/relation_test.go

state/service.go

state/service_test.go

state/settings_test.go

state/state.go

state/state_test.go

state/unit.go

state/unit_test.go

state/watcher.go

store/store_test.go

testing/mgo.go

version/version.go

worker/firewaller/firewaller.go

worker/firewaller/firewaller_test.go

worker/machiner/machiner.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_test.go

worker/uniter/filter.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

state/service.go

352

352

if u.doc.Service != s.doc.Name {

353

353

return fmt.Errorf("unit is not assigned to service %q", s)

354

354

}

355

if u.doc.MachineId != nil {

355

if u.doc.MachineId != "" {

356

356

err = u.UnassignFromMachine()

357

357

if err != nil {

358

358

return err

Older »