non-FF merge from master
p.mayers at imperial.ac.uk
Tue Nov 13 15:41:47 CET 2012
On 13/11/12 14:35, Phil Mayers wrote:
> I just had another "update (forced)" pull when I did "get fetch --all"
> on the master branch, followed by a failure to "git merge" onto my local
> As mentioned previously, my "master" branch is pristine, and should be
> unchanged from upstream "master".
> Is someone doing "rebase" on master? If so, can I cast a vote for
> "please don't"?
The offending commits seem to be:
Author: Chris Mikkelson <cmikk at qwest.net>
Date: Wed Feb 8 13:14:11 2012 -0600
Handle tagged attributes with multiple values in rlm_perl.
Author: Arran Cudbard-Bell <a.cudbardb at freeradius.org>
Date: Sun Oct 28 11:47:46 2012 +0000
Add tag matching to pairdelete and paircopy2
...which have changed in the upstream repo at some point. Maybe this was
actually a result of last time?
More information about the Freeradius-Devel