summaryrefslogtreecommitdiffstats
path: root/VERSION.m4
diff options
context:
space:
mode:
authorMartin Babinsky <mbabinsk@redhat.com>2017-03-09 18:14:52 +0100
committerMartin Basti <mbasti@redhat.com>2017-03-14 18:37:10 +0100
commit1b5f56d15455b6019dd532cb9635fa2c44cb0022 (patch)
tree11efce9db63ed865aa45f46860712309f9645e5c /VERSION.m4
parent594c87daf873ceec0c0cf3464bcb1aadb9f2b92a (diff)
downloadfreeipa-1b5f56d15455b6019dd532cb9635fa2c44cb0022.tar.gz
freeipa-1b5f56d15455b6019dd532cb9635fa2c44cb0022.tar.xz
freeipa-1b5f56d15455b6019dd532cb9635fa2c44cb0022.zip
ipaconfig: add the ability to manipulate domain resolution order
optional attribute was added to config object along with validator that check for valid domain names and also checks whether the specified domains exist in FreeIPA or in trusted forests and, in case of trusted domains, are not disabled. Part of http://www.freeipa.org/page/V4/AD_User_Short_Names https://pagure.io/freeipa/issue/6372 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'VERSION.m4')
-rw-r--r--VERSION.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/VERSION.m4 b/VERSION.m4
index 246d6bb59..9766c749b 100644
--- a/VERSION.m4
+++ b/VERSION.m4
@@ -73,8 +73,8 @@ define(IPA_DATA_VERSION, 20100614120000)
# #
########################################################
define(IPA_API_VERSION_MAJOR, 2)
-define(IPA_API_VERSION_MINOR, 221)
-# Last change: cert: include certificate chain in cert command output
+define(IPA_API_VERSION_MINOR, 222)
+>>>>>>> ipaconfig: add the ability to manipulate domain resolution order
########################################################