juju-core

Code review comment for lp:~thumper/juju-core/common-api-env-watcher

  1. common-api-env-watcher
  2. Merge into trunk
Revision history for this message
Go Bot (go-bot) wrote :

Attempt to merge into lp:juju-core failed due to conflicts:

text conflict in state/api/deployer/deployer.go
text conflict in state/api/machiner/machiner.go
text conflict in state/api/provisioner/provisioner.go

« Back to merge proposal