Rev 6515: Merge the 2.4 branch, and no-op out the changes for just the reconnection logic. in http://bazaar.launchpad.net/~jameinel/2.5/2.5-merges-2.4

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/2.5/2.5-merges-2.4

------------------------------------------------------------
revno: 6515 [merge]
revision-id: john at arbash-meinel.com-20130530113859-jhexdbtzd8firdnw
parent: pqm at pqm.ubuntu.com-20130527102002-0k9g4cvhocz44chz
parent: pqm at pqm.ubuntu.com-20130528070151-u41ave93eai032av
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-merges-2.4
timestamp: Thu 2013-05-30 12:38:59 +0100
message:
  Merge the 2.4 branch, and no-op out the changes for just the reconnection logic.
  
  The reconnect code was already in 2.5, and the backporting lost the ancestry.
  There is enough *other* code changes that it just caused lots of conflicts with what 
  was already correct.
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2013-05-23 09:27:10 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2013-05-30 11:38:59 +0000
@@ -63,6 +63,12 @@
   This shouldn't be treated as a fatal error.
   (John Arbash Meinel, #1075108)
 
+* Teach the bzr client how to reconnect if we get ``ConnectionReset``
+  while making an RPC request. This doesn't handle all possible network
+  disconnects, but it should at least handle when the server is asked to
+  shutdown gracefully. This is a backport of the functionality in bzr-2.5.
+  (John Arbash Meinel, #819604)
+
 * Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
   the sha hash of the long testament matches the sha hash in the short
   form. (John Arbash Meinel, #1010339)