Merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.1 into lp:ubuntu/maverick/ubuntu-sso-client

Proposed by Natalia Bidart on 2010-09-14
Status: Merged
Merge reported by: Natalia Bidart
Merged at revision: not available
Proposed branch: lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.1
Merge into: lp:ubuntu/maverick/ubuntu-sso-client
Diff against target: 53 lines (+13/-3)
4 files modified
PKG-INFO (+1/-1)
debian/changelog (+10/-0)
setup.py (+1/-1)
ubuntu_sso/main.py (+1/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.1
Reviewer Review Type Date Requested Status
Michael Vogt 2010-09-14 Approve on 2010-09-15
Review via email: mp+35482@code.launchpad.net

Description of the Change

Minor tweak to 1.0.0 release.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks, merged and uploaded

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'PKG-INFO'
2--- PKG-INFO 2010-09-13 14:43:37 +0000
3+++ PKG-INFO 2010-09-14 22:35:56 +0000
4@@ -1,6 +1,6 @@
5 Metadata-Version: 1.1
6 Name: ubuntu-sso-client
7-Version: 1.0.0
8+Version: 1.0.1
9 Summary: Ubuntu Single Sign-On client
10 Home-page: https://launchpad.net/ubuntu-sso-client
11 Author: Natalia Bidart
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2010-09-14 13:50:23 +0000
15+++ debian/changelog 2010-09-14 22:35:56 +0000
16@@ -1,3 +1,13 @@
17+ubuntu-sso-client (1.0.1-0ubuntu1) UNRELEASED; urgency=low
18+
19+ * New upstream release:
20+
21+ [ Natalia B. Bidart <natalia.bidart@canonical.com> ]
22+ * When authentication/registration is successful, ping production URL for
23+ Ubuntu One Servers (instead of egde's) (LP: #638100).
24+
25+ -- Natalia Bidart (nessita) <nataliabidart@gmail.com> Tue, 14 Sep 2010 19:28:09 -0300
26+
27 ubuntu-sso-client (1.0.0-0ubuntu1) maverick; urgency=low
28
29 * New upstream release:
30
31=== modified file 'setup.py'
32--- setup.py 2010-09-13 14:43:37 +0000
33+++ setup.py 2010-09-14 22:35:56 +0000
34@@ -86,7 +86,7 @@
35
36 DistUtilsExtra.auto.setup(
37 name='ubuntu-sso-client',
38- version='1.0.0',
39+ version='1.0.1',
40 license='GPL v3',
41 author='Natalia Bidart',
42 author_email='natalia.bidart@canonical.com',
43
44=== modified file 'ubuntu_sso/main.py'
45--- ubuntu_sso/main.py 2010-09-13 14:43:37 +0000
46+++ ubuntu_sso/main.py 2010-09-14 22:35:56 +0000
47@@ -53,7 +53,7 @@
48
49
50 logger = setup_logging("ubuntu_sso.main")
51-PING_URL = "https://edge.one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
52+PING_URL = "https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
53 SERVICE_URL = "https://login.ubuntu.com/api/1.0"
54
55

Subscribers

People subscribed via source and target branches

to all changes: