Issue 9975046: Fix the discrepancy between dev and rel branches.

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 9975046: Fix the discrepancy between dev and rel branches.

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

Created:
10 years, 10 months ago by bac

Modified:
10 years, 10 months ago

Reviewers:
teknico, mp+167333

Visibility:
Public.

Description

Fix the discrepancy between dev and rel branches. Changes that should've been submitted to the development branch of the gui (lp:~juju-gui/charms/precise/juju-gui/trunk) were instead merged into the release branch (lp:charms/juju-gui). This branch merges those changes back into devel for on-going work. The premature release will remain in place. https://code.launchpad.net/~bac/charms/precise/juju-gui/released-changes/+merge/167333 (do not edit description out of merge proposal)

Patch Set 1 #

Patch Set 2 : Fix the discrepancy between dev and rel branches. #

Created: 10 years, 10 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+89 lines, -48 lines)			Patch
A	Dependencies.md	View	1 chunk	+46 lines, -0 lines	0 comments	Download
A	[revision details]	View	1 chunk	+2 lines, -0 lines	0 comments	Download
M	config.yaml	View	3 chunks	+38 lines, -33 lines	0 comments	Download
M	hooks/backend.py	View	3 chunks	+0 lines, -9 lines	0 comments	Download
M	hooks/install	View	1 chunk	+3 lines, -3 lines	0 comments	Download
M	hooks/utils.py	View	3 chunks	+0 lines, -3 lines	0 comments	Download

Messages

Total messages: 3

Expand All Messages | Collapse All Messages

bac

10 years, 10 months ago (2013-06-04 16:44:13 UTC) #3

*** Submitted:

Fix the discrepancy between dev and rel branches.

Changes that should've been submitted to the development branch of the gui
(lp:~juju-gui/charms/precise/juju-gui/trunk) were instead merged into the
release branch (lp:charms/juju-gui).

This branch merges those changes back into devel for on-going work.  The
premature release will remain in place.

R=teknico
CC=
https://codereview.appspot.com/9975046

Expand All Messages | Collapse All Messages