Oof.

Apache gitbox for nifi head

commit 050491376119f3a5fbbc0ba135f60e1a82d23989 (HEAD -> main, upstream/main)
Author: exceptionfactory <exceptionfact...@apache.org>
Date:   Thu Feb 17 11:15:58 2022 -0600

    NIFI-9706 Added Memory Resource Consideration to JoltTransformJSON

    This closes #5781

    Signed-off-by: Mike Thomsen <mthom...@apache.org>

commit a837397d563588c2659043659487b55cabd5923d
Author: Mike Thomsen <mthom...@apache.org>
Date:   Mon Aug 9 16:11:20 2021 -0400

    NIFI-8209 Added Neo4J 4.X and 3.X clients by splitting the current
controller service along release lines. This was necessary because
Neo4J broke compatibility in their client drivers for Java between 3.X
and 4.X at the Java API level.
    NIFI-8209 Updated module name.
    NIFI-8209 Updated parent module.
    NIFI-8209 Renamed a few misnamed modules.
    NIFI-8209 Updated 1.15.0-SNAPSHOT references in cypher v3 package.
    NIFI-8209 Updated neo4j 4.x driver.

    NIFI-8209 Made changes requested in a code review.

    NIFI-8209: Fixed NAR module name
    Signed-off-by: Matthew Burgess <mattyb...@apache.org>

    This closes #5301

Apache NiFI Github Main

commit 2f3380390db2aba9fbafcdca5a8b3ffbb92acac4 (github/main)
Author: Matthew Burgess <mattyb...@apache.org>
Date:   Wed Feb 16 18:07:57 2022 -0500

    NIFI-8492: Addressed issue in DatabaseReader class of
IPLookupService that was attempting to set values on the JSON returned
by MaxMind. Instead of modifying the object directly, we should use an
Injectable in the Reader so that the value read will have the
appropriate values but we don't need to modify those objects returned
by MaxMind. Similar solution of NIFI-5814

    Signed-off-by: Nathan Gough <thena...@gmail.com>

    This closes #5777.

commit a837397d563588c2659043659487b55cabd5923d
Author: Mike Thomsen <mthom...@apache.org>
Date:   Mon Aug 9 16:11:20 2021 -0400

    NIFI-8209 Added Neo4J 4.X and 3.X clients by splitting the current
controller service along release lines. This was necessary because
Neo4J broke compatibility in their client drivers for Java between 3.X
and 4.X at the Java API level.
    NIFI-8209 Updated module name.
    NIFI-8209 Updated parent module.
    NIFI-8209 Renamed a few misnamed modules.
    NIFI-8209 Updated 1.15.0-SNAPSHOT references in cypher v3 package.
    NIFI-8209 Updated neo4j 4.x driver.

    NIFI-8209 Made changes requested in a code review.

    NIFI-8209: Fixed NAR module name
    Signed-off-by: Matthew Burgess <mattyb...@apache.org>

    This closes #5301

Long story short they each have different heads now it appears.  I'm
guessing the sync process stalled out and someone made a commit to
each of the heads.  We'll see what infra recommends.

Filing a JIRA now

Thanks

On Thu, Feb 17, 2022 at 12:57 PM Joe Witt <joe.w...@gmail.com> wrote:
>
> Hmmm we had a case like this the other day (in the other direction
> though) https://issues.apache.org/jira/browse/INFRA-22884
>
> We might need to file another JIRA to Infra.
>
> Thanks
>
> On Thu, Feb 17, 2022 at 12:54 PM Mike Thomsen <mikerthom...@gmail.com> wrote:
> >
> > I merged this https://github.com/apache/nifi/pull/5781 locally and
> > pushed up the Apache gitbox and am not seeing the change mirrored on
> > GitHub. Did something change recently?
> >
> > Thanks,
> >
> > Mike

Reply via email to