[Koha-bugs] [Bug 6979] LDAP authentication fails during password comparison
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Fri Dec 2 03:31:53 CET 2016
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6979
Alex Buckley <alexbuckley at catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |alexbuckley at catalyst.net.nz
--- Comment #24 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
The 'Update tests' patch fails to apply, when you try to apply this patch to
koha.
This is the result:
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug #6979
Applying: Bug 6979 - Update tests
Using index info to reconstruct a base tree...
M t/db_dependent/Auth_with_ldap.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Auth_with_ldap.t
CONFLICT (content): Merge conflict in t/db_dependent/Auth_with_ldap.t
Failed to merge in the changes.
Patch failed at 0001 Bug 6979 - Update tests
The copy of the patch that failed is found in:
/home/vagrant/kohaclone/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-6979---Update-tests-EmFl3l.patch
--
You are receiving this mail because:
You are watching all bug changes.
You are the QA Contact for the bug.
More information about the Koha-bugs
mailing list