25 Dec
2014
25 Dec
'14
3:16 p.m.
On Thursday, December 25, 2014 11:54:33 AM Gui Iribarren wrote:
i've pushed a commit to hotfix this in
release/14.08 (since at it stands
now, release/14.08 is broken)
https://github.com/libre-mesh/lime-packages/commit/578dc314b61c27a8deca735f4
ab7e40051e7cb53
if nobody objects until tomorrow i'll merge it in develop as well
BTW is not a good idea to merge release branch in develop, because this way
also release specific commit like config edit, ip range and similar stuff will
override develop one, the approach we consensuated is using hotfix branches.
As the fix is already pushed in public repo in the release branch for this time
we can simply cherry pitch just that commit in develop instead of merging the
release branch, so we can avoid overriding end/or conflicts ;)