Landscape Client

Merge lp:~bkerensa/landscape-client/trunk into lp:~landscape/landscape-client/trunk

  1. trunk
  2. Merge into trunk
Proposed by Benjamin Kerensa on 2012-05-23
Status: Rejected
Rejected by: Dean Henrichsmeyer on 2012-05-31
Proposed branch: lp:~bkerensa/landscape-client/trunk
Merge into: lp:~landscape/landscape-client/trunk
Diff against target: 44 lines (+15/-2)
3 files modified
applications/landscape-client-settings.desktop.in (+1/-1)
debian/changelog (+13/-0)
landscape/broker/config.py (+1/-1)
To merge this branch: bzr merge lp:~bkerensa/landscape-client/trunk
Reviewer Review Type Date Requested Status
Dean Henrichsmeyer 2012-05-23 Disapprove on 2012-05-31
Barry Warsaw 2012-05-23 Pending
Review via email: mp+106921@code.launchpad.net

Description of the Change

* Adjust name in System Settings UI to better reflect nature of application and be less ambiguous

To post a comment you must log in.
lp:~bkerensa/landscape-client/trunk updated on 2012-05-23
565. By Benjamin Kerensa on 2012-05-23

Polished Registration Key Name

Dean Henrichsmeyer (dean) wrote :

This branch doesn't just include a fix related to #1001468, it incorporates changes related to #962974. Please keep branches related to a single bug when they're not related.

review: Disapprove

Unmerged revisions

565. By Benjamin Kerensa on 2012-05-23

Polished Registration Key Name

564. By Benjamin Kerensa on 2012-05-23

Adjusted Name in UI

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'applications/landscape-client-settings.desktop.in'
2--- applications/landscape-client-settings.desktop.in 2012-03-23 10:04:18 +0000
3+++ applications/landscape-client-settings.desktop.in 2012-05-23 01:01:18 +0000
4@@ -1,5 +1,5 @@
5 [Desktop Entry]
6-_Name=Management Service
7+_Name=Landscape Administration
8 _Comment=Management Service Preferences
9 Exec=landscape-client-ui-install
10 Icon=preferences-management-service
11
12=== modified file 'debian/changelog'
13--- debian/changelog 2012-03-28 17:06:17 +0000
14+++ debian/changelog 2012-05-23 01:01:18 +0000
15@@ -1,3 +1,16 @@
16+landscape-client (12.04.3-0ubuntu0.12.04.2) quantal; urgency=low
17+
18+
19+ * Polish Registration Key Name (LP: #1001468)
20+
21+ -- Benjamin Kerensa <bkerensa@ubuntu.com> Tue, 22 May 2012 17:56:55 -0700
22+
23+landscape-client (12.04.3-0ubuntu0.12.04.1) quantal; urgency=low
24+
25+ * Adjust name reflected in UI (LP: #962974)
26+
27+ -- Benjamin Kerensa <bkerensa@ubuntu.com> Tue, 22 May 2012 17:36:54 -0700
28+
29 landscape-client (12.04.3-0ubuntu0.12.04.0) precise; urgency=low
30
31 * Warn on unicode entry into settings UI (LP: #956612).
32
33=== modified file 'landscape/broker/config.py'
34--- landscape/broker/config.py 2012-05-11 21:56:37 +0000
35+++ landscape/broker/config.py 2012-05-23 01:01:18 +0000
36@@ -40,7 +40,7 @@
37
38 parser.add_option("-a", "--account-name", metavar="NAME",
39 help="The account this computer belongs to.")
40- parser.add_option("-p", "--registration-key", metavar="PASSWORD",
41+ parser.add_option("-p", "--registration-key", metavar="KEY",
42 help="The account-wide key used for "
43 "registering clients.")
44 parser.add_option("-t", "--computer-title", metavar="TITLE",

Subscribers

People subscribed via source and target branches

to all changes: