[katello-devel] Important: rebasing engine branch from devel

[Brad Buckingham]

On 11/24/2013 05:50 PM, Brad Buckingham wrote:
> On 11/22/2013 12:54 PM, Brad Buckingham wrote:
>> On 11/20/2013 11:24 AM, Brad Buckingham wrote:
>>> Team,
>>>
>>> As we discussed in our scrum this morning, we plan to rebase the 
>>> engine branch with devel at the end of this week.  After this is 
>>> completed, developers should start working from the katello engine 
>>> branch and generate PRs to it (until that branch goes to master) vs 
>>> to devel.
>>>
>>> To support this, the following is the plan:
>>>
>>> 1. Developers: if you have a PR that is pending for the katello 
>>> 'devel' branch, please work to get it accepted and merged prior to 
>>> Friday Nov 22, 9am EST
>>>
>>> 2. On Thursday afternoon, Walden is going to do a merge of katello 
>>> 'master' to 'devel' to ensure it is up to date.
>>>
>>> 3. On Friday morning (shortly after 9am), I'll start on the rebase 
>>> of katello 'engine' off of 'devel', work to get tests green and run 
>>> through some manual regression/sanity testing.
>>>
>>> Once #3 is completed, I'll reply to this email.
>>>
>>> Thanks!
>>>
>>> Brad
>>>
>>> _______________________________________________
>>> katello-devel mailing list
>>> katello-devel at redhat.com
>>> https://www.redhat.com/mailman/listinfo/katello-devel
>> Team,
>>
>> I am starting the rebase now.  I'll let folks know when the rebase is 
>> finished, tested and pushed to the remote engine branch.  It may be 
>> late tonight or weekend, so if there are any questions email or ping 
>> me in irc.
>>
>> thanks,
>> Brad
>>
>> _______________________________________________
>> katello-devel mailing list
>> katello-devel at redhat.com
>> https://www.redhat.com/mailman/listinfo/katello-devel
>
> Team,
>
> A quick update on the rebase of engine on devel.  Apologies for the 
> delay; however, it took longer than expected.
>
> Friday evening, the basic rebasing of commits finished.  In the 
> process, several commits (~40) did require manual conflict resolution; 
> however, most were very trivial to address.
>
> Saturday/Sunday, we spent some time getting the tests green locally 
> (rake test:katello) and addressing issues found during UI regression 
> testing.
>
> At this point, I am not aware of any regressions that have been 
> introduced as a result of the rebase; however, I created a PR that 
> includes commits that I made after the rebase was completed.  It can 
> be found at: https://github.com/Katello/katello/pull/3429 . The intent 
> is not to merge this PR, but I wanted to give folks a chance to review 
> the changes and once ACKed, I'll force push the branch to 'engine'.
>
> If possible, I'd like to get a couple of devs to look over the PR and 
> let me know if you see any glaring issues.  Given that we want to get 
> the team developing off of the engine branch, I'd like to get feedback 
> ASAP.
>
> I'd also like to thanks Eric (ehelms) for lending a hand today with 
> debugging some issues related to font-awesome as well as issues 
> observed within devel branch.
>
> thanks,
> Brad
>
> _______________________________________________
> katello-devel mailing list
> katello-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/katello-devel
Team,

The rebase of engine has been officially accepted and pushed to :
     https://github.com/Katello/katello/tree/engine

Please use this branch for future development PRs.

thanks,
Brad