[Starlingx-discuss] CentOS 7.6 feature branch ready to merge to master
sgw at linux.intel.com
Tue Mar 12 01:16:09 UTC 2019
Thanks for handling this, I will review these docs today.
Can someone from the stx-upstream core team provide a +W to this review
, it has 2 +2s but needs the +W
On 3/11/19 8:18 AM, Dean Troyer wrote:
> On Mon, Mar 11, 2019 at 3:28 AM Saul Wold <sgw at linux.intel.com> wrote:
>>> Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change.
>> I am sure this will get taken care of correctly also once I check with Dean.
> I think the .gitreview is the only real problem you had? I do the
> merge back to master following
> and swapping the 'master' and '$feature_branch' in the arguments. It
> results in the same thing, just depends on which branch you are in at
> the time of the merge.
> Just below that is the command to fix up .gitreview (whick we skip
> when going master -> $feature_branch).
> I've re-done stx-integ, stx-root, stx-tools and
> stx-upstream. stx-manifest does not appear to have any changes to
> master required (the only new bits in the feature branch are the
> revision="" attributes that master doesn't want).
>  https://review.openstack.org/642481
>  https://review.openstack.org/642487
>  https://review.openstack.org/642485
>  https://review.openstack.org/642486
More information about the Starlingx-discuss