Merge lp:~lifeless/bzr/lp-propose-host into lp:bzr

[Robert Collins]

Switch lp-propose back to using edge. See bug 583667 for details.

Unbreak trunk for lp-propose.

[Martin Packman (gz)]

review: Approve

[Robert Collins (lifeless)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-05-21 03:28:43 +0000
+++ NEWS	2010-05-21 07:22:24 +0000
@@ -81,6 +81,12 @@
   difference).
   (Vincent Ladeuil, #320119)
 
+* ``bzr lp-propose`` which was switched to use production Launchpad API
+  servers a few commits ago has been reverted to use edge: there is a
+  problem with using production which isn't trivially obvious, so we've
+  filed a bug to track it, and until thats fixed will be using edge.
+  (Robert Collins, #583667)
+
 * ``bzr rm`` should not refuse to delete directories which contained a file
   which has been moved elsewhere in the tree after the previous commit.
   (Marius Kruger, Daniel Watkins, #129880)

=== modified file 'bzrlib/plugins/launchpad/lp_propose.py'
--- bzrlib/plugins/launchpad/lp_propose.py	2010-05-20 18:23:10 +0000
+++ bzrlib/plugins/launchpad/lp_propose.py	2010-05-21 07:22:24 +0000
@@ -70,7 +70,7 @@
         if staging:
             lp_instance = 'staging'
         else:
-            lp_instance = 'production'
+            lp_instance = 'edge'
         service = lp_registration.LaunchpadService(lp_instance=lp_instance)
         self.launchpad = lp_api.login(service)
         self.source_branch = lp_api.LaunchpadBranch.from_bzr(