Issue 32720046: tweak: just merge the 1.16 branch into trunk
Descriptiontweak: just merge the 1.16 branch into trunk
This assumes that all changes currently in 1.16 are already in trunk
(which seems to be a safe assumption). I did audit a few of the
changes to make sure everything looked sane.
I'm going to be doing some more 1.16 work, and if we can land on 1.16
and just merge into trunk then it will be easier, so this is a minor
prereq.
The only actual change that wasn't merged before was updating
setup.iss which this includes.
https://code.launchpad.net/~jameinel/juju-core/merge-1.16/+merge/196702
(do not edit description out of merge proposal)
Patch Set 1 #Patch Set 2 : tweak: just merge the 1.16 branch into trunk #
MessagesTotal messages: 2
|
||||||||||||||||||||||||||||
