From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster
---
components/visual-panels/usermgr/src/apis/usermgr.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/components/visual-panels/usermgr/src/apis/usermgr.xml b/components/visual-panels/usermgr/src/apis/usermgr.xml
index 766964d..e52fdbc 100644
--- a/components/visual-panels/usermgr/src/apis/usermgr.xml
+++ b/components/visual-panels/usermgr/src/apis/usermgr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
CDDL HEADER START
@@ -157,6 +157,12 @@
</summary>
<list type="string"/>
</field>
+ <field name="authProfiles" nullable="true">
+ <summary> Specifies the authenticated profiles that have been
+ assigned to the account.
+ </summary>
+ <list type="string"/>
+ </field>
<field name="auths" nullable="true">
<summary> Specifies the authorizations that have been assigned
to the account.
@@ -199,6 +205,7 @@
<field type="boolean" name="homedirChanged"/>
<field type="boolean" name="defShellChanged"/>
<field type="boolean" name="profilesChanged"/>
+ <field type="boolean" name="authProfilesChanged"/>
<field type="boolean" name="rolesChanged"/>
<field type="boolean" name="authsChanged"/>
<field type="boolean" name="limitPrivChanged"/>
@@ -671,7 +678,8 @@
<doc>
Sets the filter options which are used for
all the subsequent operations. The options
- are user or role and search string.
+ are user or role and search string. The
+ default search string is empty string ("").
</doc>
<argument name="usertype" typeref="UserType">
<summary> Specifies if users or roles
--
Gitblit v1.9.3