Hi all,
After examining the 25 commits to master since RC1, and considering the
community’s desire to incorporate all patches related to the themes of Kerberos
support and REST and UI, it seemed to me there were only 4 or 5 that didn’t fit
the themes.
It wasn’t worth the effort to cherry-pick everything EXCEPT those 4, because
excluding those messed up the fast-forwards. So I decided to simply rebase
branch Metron_0.4.0 to current master, which I’ve just done. The RC2 candidate
will be generated and proposed for vote shortly.
This means that if you fetch or pull from the Apache github into a local repo
with the Metron_0.4.0 branch, it will error because it can’t fast-forward.
This condition should be cleared if you use the “-f” (force) flag, either in
the command that failed, or (to limit the scope of the -f) in:
git fetch -f origin Metron_0.4.0
If your working directory is a checkout of a local Metron_0.4.0 branch that you
wish to update, you may need to say:
git pull -f origin Metron_0.4.0
Sorry for the inconvenience.
Thanks,
--Matt
