Viewing all changes in revision 6437.78.1.
- Committer: John Arbash Meinel
- Date: 2013-05-30 11:38:59 UTC
- mfrom: (6015.57.7 2.4)
- mto: (6437.77.2 2.5)
- mto: This revision was merged to the branch mainline in revision 6579.
- Revision ID: john@arbash-meinel.com-20130530113859-jhexdbtzd8firdnw
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.
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.
- files modified:
- doc/en/release-notes/bzr-2.4.txt
expand all
collapse all
added
removed
