Merge lp://staging/~niemeyer/juju-core/confignode-to-settings into lp://staging/~juju/juju-core/trunk

Proposed by Gustavo Niemeyer
Status: Merged
Merged at revision: 637
Proposed branch: lp://staging/~niemeyer/juju-core/confignode-to-settings
Merge into: lp://staging/~juju/juju-core/trunk
Diff against target: 581 lines (+82/-82)
11 files modified
environs/open_test.go (+1/-1)
state/relation.go (+6/-6)
state/relation_test.go (+1/-1)
state/service.go (+2/-2)
state/settings.go (+20/-20)
state/settings_test.go (+32/-32)
state/state.go (+3/-3)
state/unit.go (+2/-2)
state/watcher.go (+11/-11)
worker/provisioner/provisioner_test.go (+1/-1)
worker/uniter/jujuc/context.go (+3/-3)
To merge this branch: bzr merge lp://staging/~niemeyer/juju-core/confignode-to-settings
Reviewer Review Type Date Requested Status
The Go Language Gophers Pending
Review via email: mp+128574@code.staging.launchpad.net

Description of the change

state: rename ConfigNode as Settings

https://codereview.appspot.com/6642046/

To post a comment you must log in.
Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :

Reviewers: mp+128574_code.launchpad.net,

Message:
Please take a look.

Description:
state: rename ConfigNode as Settings

https://code.launchpad.net/~niemeyer/juju-core/confignode-to-settings/+merge/128574

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6642046/

Affected files:
   A [revision details]
   M environs/open_test.go
   M state/confignode.go
   M state/confignode_test.go
   M state/relation.go
   M state/relation_test.go
   M state/service.go
   M state/state.go
   M state/unit.go
   M state/watcher.go
   M worker/provisioner/provisioner_test.go
   M worker/uniter/jujuc/context.go

Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :
Revision history for this message
William Reade (fwereade) wrote :

LGTM. Just wish we could come up with a better var name than "node" :).

https://codereview.appspot.com/6642046/

Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :

On 2012/10/08 22:21:35, fwereade wrote:
> LGTM. Just wish we could come up with a better var name than "node"
:).

"settings" is the proper term, I think. There are still several places
that need fixing, but this involves more manual handling and conflict
solving, so we can do that as we go.

https://codereview.appspot.com/6642046/

Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :

*** Submitted:

state: rename ConfigNode as Settings

R=fwereade
CC=
https://codereview.appspot.com/6642046

https://codereview.appspot.com/6642046/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches