Issue 6541065: worker/provisioner: fix non-conflicting merge race

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 6541065: worker/provisioner: fix non-conflicting merge race

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

Created:
11 years, 7 months ago by niemeyer

Modified:
11 years, 7 months ago

Reviewers:
mp+126058

Visibility:
Public.

Description

worker/provisioner: fix non-conflicting merge race Tests of the provisioner pass, but state's API had changed under another merge. This fixes it. https://code.launchpad.net/~niemeyer/juju-core/trivial-provisioner-tests-fix/+merge/126058 (do not edit description out of merge proposal)

Patch Set 1 #

Patch Set 2 : worker/provisioner: fix non-conflicting merge race #

Created: 11 years, 7 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+5 lines, -3 lines)			Patch
	A	[revision details]	View		1 chunk	+2 lines, -0 lines	0 comments	Download
	M	worker/provisioner/provisioner_test.go	View		3 chunks	+3 lines, -3 lines	0 comments	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

niemeyer

11 years, 7 months ago (2012-09-24 17:21:37 UTC) #2

*** Submitted:

worker/provisioner: fix non-conflicting merge race

Tests of the provisioner pass, but state's API had changed
under another merge. This fixes it.

R=
CC=
https://codereview.appspot.com/6541065

Expand All Messages | Collapse All Messages