Issue 26100043: fix lp:1089289 for 1.16

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 26100043: fix lp:1089289 for 1.16

Can't Edit
Can't Publish+Mail
Start Review

Created:
10 years, 5 months ago by fwereade

Modified:
10 years, 5 months ago

Reviewers:
mp+195088, rog

Visibility:
Public.

Description

fix lp:1089289 for 1.16 involves trunk revisions: 2015, 2025 for destroy-machine and destroy-unit over the API 2045 for force-destroy-machine in state 2050, 2051 for force-destroy-machine in api ...and a tweak to cmd/jujud/machine_test.go to revert functionality in r2045 that depends on post-1.16 address-handling code. https://code.launchpad.net/~fwereade/juju-core/fix-1089289-for-1.16/+merge/195088 Requires: https://code.launchpad.net/~fwereade/juju-core/fix-1233457-for-1.16/+merge/195003 (do not edit description out of merge proposal)

Patch Set 1 #

Created: 10 years, 5 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+905 lines, -483 lines)			Patch
A	[revision details]	View	1 chunk	+2 lines, -0 lines	0 comments	Download
M	cmd/juju/destroymachine.go	View	3 chunks	+21 lines, -4 lines	0 comments	Download
M	cmd/juju/destroymachine_test.go	View	5 chunks	+51 lines, -14 lines	0 comments	Download
M	cmd/juju/destroyunit.go	View	2 chunks	+3 lines, -8 lines	0 comments	Download
M	cmd/jujud/machine_test.go	View	1 chunk	+13 lines, -1 line	0 comments	Download
M	state/api/client.go	View	2 chunks	+13 lines, -1 line	0 comments	Download
M	state/api/params/params.go	View	1 chunk	+6 lines, -0 lines	0 comments	Download
M	state/apiserver/client/client.go	View	4 chunks	+56 lines, -1 line	0 comments	Download
M	state/apiserver/client/client_test.go	View	1 chunk	+139 lines, -0 lines	0 comments	Download
M	state/apiserver/client/perm_test.go	View	1 chunk	+1 line, -1 line	0 comments	Download
A	state/cleanup.go	View	1 chunk	+208 lines, -0 lines	0 comments	Download
A	state/cleanup_test.go	View	1 chunk	+229 lines, -0 lines	0 comments	Download
M	state/life.go	View	1 chunk	+8 lines, -1 line	0 comments	Download
M	state/life_test.go	View	5 chunks	+5 lines, -15 lines	0 comments	Download
M	state/machine.go	View	2 chunks	+20 lines, -3 lines	0 comments	Download
M	state/machine_test.go	View	5 chunks	+13 lines, -44 lines	0 comments	Download
M	state/relationunit_test.go	View	26 chunks	+88 lines, -87 lines	0 comments	Download
M	state/service_test.go	View	2 chunks	+3 lines, -3 lines	0 comments	Download
M	state/state.go	View	2 chunks	+0 lines, -157 lines	0 comments	Download
M	state/state_test.go	View	1 chunk	+0 lines, -33 lines	0 comments	Download
D	state/statecmd/destroyunit.go	View	1 chunk	+0 lines, -16 lines	0 comments	Download
M	state/unit_test.go	View	9 chunks	+26 lines, -94 lines	0 comments	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

rog

10 years, 5 months ago (2013-11-15 10:42:04 UTC) #2

On 2013/11/13 16:04:22, fwereade wrote:
> Please take a look.

LGTM assuming it all works live.

Although this is obviously not a thorough review - it's too
much to take in at one sitting, especially with respect
to the subtly different 1.16 code.

Expand All Messages | Collapse All Messages