The correct version of the commit before it was merged is as follows:

commit be0daf4015b19b377164a03c693a62f988ba1fee
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeu...@kolabsys.com>
Date:   Tue Mar 3 02:03:21 2015 +0100

    Add a note on Cyrus IMAP Murder Topologies that upgrade to 2.5.0
    
    Fixes T16

diff --git a/source/imap/release-notes/2.5/x/2.5.0.rst 
b/source/imap/release-notes/2.5/x/2.5.0.rst
index a581f23..d7f78db 100644
--- a/source/imap/release-notes/2.5/x/2.5.0.rst
+++ b/source/imap/release-notes/2.5/x/2.5.0.rst
@@ -13,6 +13,8 @@ Cyrus IMAP 2.5.0 Release Notes
 Upgrading to Cyrus IMAP 2.5.0
 =============================
 
+.. rubric:: ``cyrus.index`` database format upgrade
+
 Upgrading to Cyrus IMAP 2.5.0 recommends the upgrade of database
 formats, for which the reconstruct utility has been modified allowing
 administrators to run:
@@ -39,10 +41,18 @@ later versions.
     more granularly specify which mailboxes' :file:`cyrus.index` is to
     be upgraded.
 
+.. rubric:: Quota fixes and enhancements
+
 After all mailboxes are upgraded, you should run ``quota -f`` to make
 all message and folder counts are correct. The new quota types that
 Cyrus IMAP 2.5.0 supports require the counts to need to be accurate.
 
+.. rubric:: Cyrus IMAP Murder Topologies
+
+Environments that run a Cyrus IMAP Murder topology will want to upgrade
+their backends before they upgrade their frontends. See :task:`16` for
+details.
+
 .. _relnotes-2.5.0-new-features:
 
 New Features





> On 22 Dec 2016, at 20:22, Simon Amor via Cyrus-devel 
> <cyrus-devel@lists.andrew.cmu.edu> wrote:
> 
> Hi,
> 
> I raised it on the irc channel a few weeks back, but when the docs were 
> merged into the main tree, the commit messages somehow got offset by 1 
> commit. Can't remember which way it went but I was looking for my big doc 
> commit and it turned out to be the one before/after I found.
> 
> No idea how you'd fix it, but that might be why the commit below doesn't 
> correspond to T16. 
> 
> Simon
> 
>> On 21 Dec 2016, at 22:34, Nic Bernstein via Cyrus-devel 
>> <cyrus-devel@lists.andrew.cmu.edu> wrote:
>> 
>> Bron,
>> Darn!  The only reference I'm able to find to T16 is in commit a412ffd97b26, 
>> which is about as unrelated to the issue as can be:
>> $ git show a412ffd97b26
>> commit a412ffd97b2678f8bf5da967116b8759f0ebbfa1
>> Author: Jeroen van Meeuwen (Kolab Systems) 
>> <vanmeeu...@kolabsys.com>
>> 
>> Date:   Tue Mar 3 02:03:21 2015 +0100
>> 
>>    Add a note on Cyrus IMAP Murder Topologies that upgrade to 2.5.0
>> 
>>    Fixes T16
>> 
>> diff --git a/doc/source/imap/features/namespaces.rst 
>> b/doc/source/imap/features/namespaces.rst
>> index 8be8d3f..7c37603 100644
>> --- a/doc/source/imap/features/namespaces.rst
>> +++ b/doc/source/imap/features/namespaces.rst
>> @@ -25,6 +25,8 @@ By default, up to versions prior to Cyrus IMAP version
>> *netnews* namespace convention -- a ``.`` (dot) character is used as the
>> hierarchy separator.
>> 
>> +Further implications and limitations of this convention include:
>> +
>> *   Mailbox names are case-sensitive,
>> *   A mailbox name may not start with a ``.`` (dot) character,
>> *   A mailbox name may not contain two ``.`` (dot) characters in a row,
>> 
>> This obviously has nothing to do with Murder and is just an editorial 
>> comment in the documentation.
>> 
>> Anyone else know what T16 might have been about? :-[
>>    -nic
>> 
>> On 12/21/2016 03:19 PM, Bron Gondwana wrote:
>>> Hi Nic,
>>> 
>>> My understanding is that Kolab had a disk failure and lost 
>>> git.cyrus.foundation, so I have been unable to get anything out of 
>>> Phabricator.
>>> 
>>> Unfortunately before that time I didn't have the correct administrative 
>>> access to be able to extract all the tasks and information, so I'm going to 
>>> assume everything that we did on that system that wasn't in the git 
>>> repositories and synced out is now lost.  I'm quite annoyed with myself 
>>> that I didn't at least save HTML dumps of the pages that I had access to 
>>> see, but I assumed I could get the data out cleanly at some point in the 
>>> future, so I didn't push as hard as I should.
>>> 
>>> Regards,
>>> 
>>> Bron.
>>> 
>>> 
>>> On Thu, 22 Dec 2016, at 04:15, Nic Bernstein wrote:
>>>> Friends,
>>>> Where did the Maniphest Tasks go when the move to github was made?
>>>> 
>>>> I ask because the release notes for 2.5.X say:
>>>> 
>>>> Make sure to read the Upgrading to Cyrus IMAP 2.5.0 notes (all of them).
>>>> and those notes contain this:
>>>> 
>>>> Cyrus IMAP Murder Topologies
>>>> Environments that run a Cyrus IMAP Murder topology will want to upgrade 
>>>> their backends before they upgrade their frontends. See Task #16 for 
>>>> details.
>>>> But the link for Task #16 is dead, still pointing to git.cyrus.foundation:
>>>> 
>>>> glop:master$ grep -iR foundation cyrus-imapd/docsrc/
>>>> cyrus-imapd/docsrc/imap/download/release-notes/2.5/x/2.5.0.rst:Please see 
>>>> https://git.cyrus.foundation/.
>>>> cyrus-imapd/docsrc/conf.py:        
>>>> 'task':('https://git.cyrus.foundation/T%s', 'Task #'),
>>>> I'd be happy to fix that, but am unclear as to where this information now 
>>>> lives.
>>>> 
>>>> Cheers,
>>>>    -nic
>>>> 
>>>> 
>>>> On 06/23/2016 06:37 PM, Bron Gondwana via Cyrus-devel wrote:
>>>>> Hi all,
>>>>> 
>>>>> Phabricator is being deprecated.  The project is moving to github at:
>>>>> 
>>>>> 
>>>>> https://github.com/cyrusimap/
>>>>> 
>>>>> 
>>>>> I'm working on migrating all the bugs from bugzilla and phabricator to be 
>>>>> github issues.  For now the website is still hosted at CMU.
>>>>> 
>>>>> One thing I'm doing is applying a "kill commit" to the top of the git 
>>>>> repositories at the other locations.  This doesn't lose any history, you 
>>>>> can just reset --hard HEAD^ to get back to the latest master commit - but 
>>>>> it does discourage any further pushes of commits that get lost, because 
>>>>> they won't merge or rebase very happily on top of the kill commit!
>>>>> 
>>>>> The kill commit contains a small README.txt which tells you how to update 
>>>>> your git repository to point to the new location.
>>>>> 
>>>>> Cheers,
>>>>> 
>>>>> Bron.
>>>>> 
>>>>> 
>>>>> 
>>>> 
>>>> -- 
>>>> Nic Bernstein                             
>>>> n...@onlight.com
>>>> 
>>>> Onlight, Inc.                             
>>>> www.onlight.com
>>>> 
>>>> 6525 W Bluemound Road, Suite 24           v. 414.272.4477
>>>> Milwaukee, Wisconsin  53213-4073
>>>> 
>>>> 
>>>> Email had 1 attachment:
>>>>    • nic.vcf
>>>>  1k (text/x-vcard)
>>> 
>>> --
>>>  Bron Gondwana
>>>  br...@fastmail.fm
>>> 
>>> 
>> 
>> -- 
>> Nic Bernstein                             
>> n...@onlight.com
>> 
>> Onlight, Inc.                             
>> www.onlight.com
>> 
>> 6525 W Bluemound Road, Suite 24           v. 414.272.4477
>> Milwaukee, Wisconsin  53213-4073
>> 
>> <nic.vcf>
> 

Reply via email to