[Merge] ~kick-d/ubuntu/+source/amavisd-new:master into ~ubuntu-server-dev/ubuntu/+source/amavisd-new:master

[Kick In]

OK, thanks.

2016-01-19 18:05 GMT+01:00 Robie Basak <robie.basak at canonical.com>:

> Uploaded, thanks!
>
> One thing I missed when I took your original new/debian tag and pushed to
> ~ubuntu-server-dev before you filed this MP. 1:2.7.1-2ubuntu3 shouldn't be
> the parent commit of the import of 1:2.10.1-1. The parent commit should be
> 1:2.7.1-2.
>
> This doesn't really affect the result of the merge, but it doesn't really
> portray history accurately, so does impact any future archeology a little.
> So I rebased your commits onto an import of 1:2.10.1-1 that does have
> 1:2.7.1-2 as a parent before force pushing to ~ubuntu-server-dev to fix
> that up.
> --
>
> https://code.launchpad.net/~kick-d/ubuntu/+source/amavisd-new/+git/amavisd-new/+merge/282326
> You are the owner of ~kick-d/ubuntu/+source/amavisd-new:master.
>

-- 
https://code.launchpad.net/~kick-d/ubuntu/+source/amavisd-new/+git/amavisd-new/+merge/282326
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/amavisd-new:master.