Hi Accumulo Devs,

Just wanted to share that I had updated some of the branch names in
the accumulo-testing repo to match our maintenance branches in the
main accumulo repo that we're testing. And then I merged up some
changes that were left behind on 2.0 but never merged up to 2.1.

The 4 branches now are:
2.0 (old, no changes)
2.1 (merged in changes that were in the 2.0 branch for testing
Kerberized clients)
3.1 (forked from 2.1 branch - identical with 2.1, but bumps the
accumulo dependency to 3.1.0-SNAPSHOT)
main (contains the contents of the deleted "elasticity" branch)

I debated not creating the 3.1 branch, since it was identical to 2.1,
but noticed that 2.1 and main were already starting to diverge in
unintended ways, because of uncareful merging. So, I figured this
would be most clear.

A few open PRs were automatically closed when I deleted the elasticity
branch, but I reopened them and updated them to target the main
branch. I merged one of them (#289) and commented on a few others
which I think are probably okay to merge.

Regards,
Christopher

Reply via email to