resolve conflict

OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=164
This commit is contained in:
2015-12-07 08:26:52 +00:00
committed by Git OBS Bridge
parent d60438c424
commit 3cd3228f53
6 changed files with 22 additions and 19 deletions

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Nov 20 10:39:56 UTC 2015 - jengelh@inai.de
- Update to new upstream release 1.13.2
* Initial support for Smart Card authentication was added.
* The PAM prompting was enhanced so that when Two-Factor
Authentication is used, both factors (password and token) can be
entered separately on separate prompts.
* This release supports authenticating againt a KDC proxy.
-------------------------------------------------------------------
Wed Sep 30 11:44:21 UTC 2015 - michael@stroeder.com