← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to state/status.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/status.go
4
4
        "fmt"
5
5
        "labix.org/v2/mgo"
6
6
        "labix.org/v2/mgo/txn"
 
7
        "launchpad.net/juju-core/state/api/params"
7
8
)
8
9
 
9
10
// statusDoc represents a entity status in Mongodb.  The implicit
11
12
// entity in the document's creation transaction, but omitted to allow
12
13
// direct use of the document in both create and update transactions.
13
14
type statusDoc struct {
14
 
        Status     string
 
15
        Status     params.Status
15
16
        StatusInfo string
16
17
}
17
18