lp:~jameinel/juju-core/preparation-for-1.16.5
Created by
John A Meinel
and last modified
Only
John A Meinel
can upload to this branch. If you are
John A Meinel
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Juju Engineering: Pending requested
-
Diff: 2472 lines (+1059/-489)29 files modifiedcmd/juju/destroymachine.go (+76/-3)
cmd/juju/destroymachine_test.go (+58/-14)
cmd/juju/destroyunit.go (+3/-8)
cmd/jujud/machine_test.go (+13/-1)
cmd/plugins/juju-update-bootstrap/updatebootstrap.go (+1/-1)
dependencies.tsv (+1/-1)
rpc/client.go (+8/-0)
rpc/reflect_test.go (+2/-0)
scripts/win-installer/setup.iss (+1/-1)
state/api/client.go (+13/-1)
state/api/params/params.go (+6/-0)
state/apiserver/client/client.go (+56/-1)
state/apiserver/client/client_test.go (+139/-0)
state/apiserver/client/perm_test.go (+1/-1)
state/cleanup.go (+208/-0)
state/cleanup_test.go (+229/-0)
state/life.go (+8/-1)
state/life_test.go (+5/-15)
state/machine.go (+20/-3)
state/machine_test.go (+13/-44)
state/relationunit_test.go (+88/-87)
state/service.go (+7/-3)
state/service_test.go (+3/-3)
state/state.go (+0/-157)
state/state_test.go (+0/-33)
state/statecmd/destroyunit.go (+0/-16)
state/unit.go (+22/-0)
state/unit_test.go (+77/-94)
version/version.go (+1/-1)
Superseded
for merging
into
lp:~go-bot/juju-core/trunk
- Juju Engineering: Pending requested
-
Diff: 413 lines (+246/-0) (has conflicts)9 files modifiedcmd/jujud/machine_test.go (+16/-0)
dependencies.tsv (+6/-0)
scripts/win-installer/setup.iss (+4/-0)
state/api/client.go (+15/-0)
state/api/params/params.go (+9/-0)
state/apiserver/client/client.go (+46/-0)
state/apiserver/client/client_test.go (+143/-0)
state/state.go (+3/-0)
version/version.go (+4/-0)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~go-bot/juju-core/trunk