Merge branch 'master' into develop

Author: Marcin Przepiorowski

bin/dx_ctl_users.pl

@@ -515,15 +515,16 @@ =head1 EXAMPLES
 
 Example csv user file:
 
- # operation,username,first_name,last_name,email address,work_phone,home_phone,cell_phone,type(NATIVE|LDAP),principal_credential,password,admin_priv,js_user
- # comment - create a new user with Delphix authentication
- C,testuser,Test,User,[email protected],,555-222-222,,NATIVE,,password,Y
- # comment - create a new user with LDAP
- C,testuser2,Test,User2,[email protected],555-111-111,555-222-222,555-333- 333,LDAP,"[email protected]",,Y
- # update existing user - non-empty values will be updated, password can't be modified in this version
- U,user11,FirstName,LastName,[email protected],,,,,,, U,testuser,Test,User,[email protected],,555-222-333,,NATIVE,,password,Y
- # delete user
- D,testuser2,,,,,,,,,,
+#operation,username,first_name,last_name,email address,work_phone,home_phone,cell_phone,type(NATIVE|LDAP),principal_credential,password,admin_priv,js_user,timeout,apiUser
+# comment - create a new user with Delphix authentication
+C,testuser,Test,User,[email protected],,555-222-222,,NATIVE,,password,Y,N,60,N
+# comment - create a new user with LDAP
+C,testuser2,Test,User2,[email protected],555-111-111,555-222-222,555-333-333,LDAP,"[email protected]",,Y,N,60,N
+# update existing user - non-empty values will be updated, password can't be modified in this version
+U,user11,FirstName,LastName,[email protected],,,,,,,
+U,testuser,Test,User,[email protected],,555-222-333,,NATIVE,,password,,Y
+# delete user
+D,testuser2,,,,,,,,,,,
 
 Example csv profile file:
 

bin/dxusers.csv.example

@@ -1,10 +1,11 @@
-#operation,username,first_name,last_name,email address,work_phone,home_phone,cell_phone,type(NATIVE|LDAP),principal_credential,password,admin_priv,js_user,timeout
+#operation,username,first_name,last_name,email address,work_phone,home_phone,cell_phone,type(NATIVE|LDAP),principal_credential,password,admin_priv,js_user,timeout,apiUser
 # comment - create a new user with Delphix authentication
-C,testuser,Test,User,[email protected],,555-222-222,,NATIVE,,password,Y,60
+C,testuser,Test,User,[email protected],,555-222-222,,NATIVE,,password,Y,N,60,N
 # comment - create a new user with LDAP
-C,testuser2,Test,User2,[email protected],555-111-111,555-222-222,555-333-333,LDAP,"[email protected]",,Y
+C,testuser2,Test,User2,[email protected],555-111-111,555-222-222,555-333-333,LDAP,"[email protected]",,Y,N,60,N
 # update existing user - non-empty values will be updated, password can't be modified in this version
 U,user11,FirstName,LastName,[email protected],,,,,,,
 U,testuser,Test,User,[email protected],,555-222-333,,NATIVE,,password,,Y
 # delete user
-D,testuser2,,,,,,,,,,
+D,testuser2,,,,,,,,,,,
+