Yes please open a helpdesk ticket for this. I see 2 routes we can go from
there:

1) Ask LF to do it
2) LF gives committers temporary push permissions and they can do it
themselves

I think 1) might give LF more comfort though.

Regards,
Thanh

On Tue, Jun 27, 2017 at 10:11 AM, Michal Rehak -X (mirehak - PANTHEON
TECHNOLOGIES at Cisco) <[email protected]> wrote:

> Hi all,
> merging ofjava with ofplugin yields some conflicts:
>
>   Conflicts:
>         .gitignore
>         .gitreview
>         artifacts/pom.xml
>         parent/pom.xml
>         pom.xml
>
> .git* and aggregate/pom are trivial to solve.
>
> Inspecting artifacts/pom and parent/pom I came to conclusion that decision
> regarding ofjava version is required as first step (to keep or to overwrite
> with ofplugin version). Base on that the rest can be resolved easily.
>
> I tried to create draft of the whole merge but gerrit rejected it because
> of many missing change-ids and one missing sign-off. So gerrit + merge way
> is probably too inconvenient.
>
>
> Regards,
> Michal
>
> _____________________________________
> From: [email protected] <
> [email protected]> on behalf of Robert
> Varga <[email protected]>
> Sent: Tuesday, June 27, 2017 13:14
> To: Tomáš Slušný; [email protected]
> Cc: [email protected]; [email protected];
> Michal Rehák; openflowplugin-dev
> Subject: Re: [openflowplugin-dev] [release] WEATHER - OpenFlowJava being
> merged into OpenFlowPlugin in Nitrogen
>
> On 27/06/17 12:52, Tomáš Slušný wrote:
> > Hello Robert,
> >
> >
> > I can import OpenFlowJava using `git subtree` to not lose history (and I
> > actually have it already prepared in my local repository, because that
> > was first thing I tried), but then it would create Gerrit patch for each
> > OpenFlowJava commit if I am not wrong. Or is there another method of
> > doing this merge?
>
> What we have done in the past was to ask Linux Foundation admins to
> populate the repository, side-stepping gerrit. We have done this for
> mdsal and netconf at least.
>
> I am not sure if the same effect is doable with gerrit.
>
> Regards,
> Robert
>
> _______________________________________________
> release mailing list
> [email protected]
> https://lists.opendaylight.org/mailman/listinfo/release
>
_______________________________________________
openflowplugin-dev mailing list
[email protected]
https://lists.opendaylight.org/mailman/listinfo/openflowplugin-dev

Reply via email to