Commit f5885b77 authored by Christos Stavrakakis's avatar Christos Stavrakakis Committed by Stratos Psomadakis

Fix conflict resolution in Changelog

Fix wrong conflict resolution in merge commit e3e8c90f. Also, update
CONTRIBUTORS file.
Signed-off-by: default avatarChristos Stavrakakis <stavr.chris@gmail.com>
parent a2740319
Dimitris Aragiorgis <dimitris.aragiorgis@gmail.com>
Christos Stavrakakis <stavr.chris@gmail.com>
......@@ -6,6 +6,27 @@ Unified Changelog file for Synnefo versions >= 0.13
Since v0.13 most of the Synnefo components have been merged into a single
repository and have aligned versions.
.. _Changelog-0.16.2next:
v0.16.2next
===========
Released: UNRELEASED
Astakos
-------
* Support LDAP authentication by creating the 'LDAP' authentication
provider.
* Add 'autoverify' provider policy to automatically verify the user's
email. Obsolete the 'SKIP_EMAIL_VERIFICATION' setting.
* Extend authentication provider mechanism to support mapping arbitraty
provider's attributes to user attributes. Also, support making these
attributes to be 'forced' by the provider so that user cannot change
them (e.g. the user's email).
* Minor changes so that 'local' authentication provider is treated
in the same way as all other providers.
.. _Changelog-0.16.2:
v0.16.2
......@@ -34,17 +55,6 @@ Admin
Astakos
-------
* Support LDAP authentication by creating the 'LDAP' authentication
provider.
* Add 'autoverify' provider policy to automatically verify the user's
email. Obsolete the 'SKIP_EMAIL_VERIFICATION' setting.
* Extend authentication provider mechanism to support mapping arbitraty
provider's attributes to user attributes. Also, support making these
attributes to be 'forced' by the provider so that user cannot change
them (e.g. the user's email).
* Minor changes so that 'local' authentication provider is treated
in the same way as all other providers.
=======
* Always accept terms for users created via admin API.
* Allow admin to update the 'signed terms' date for a user via the 'signTerms'
admin API action.
......@@ -105,6 +115,7 @@ Documentation
* Update install guide to use Debian Wheezy.
Pithos
------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment