cloudstack/plugins/network-elements
Rajani Karuturi 08ec6ebdda Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account
Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java

Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-29 14:38:32 +05:30
..
bigswitch-vns - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 2014-02-25 22:59:10 +01:00
cisco-vnmc - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 2014-02-25 22:59:10 +01:00
dns-notifier Removed all reminants of the IdentityService. Created the KeysManager to move the management 2014-01-14 13:11:35 -08:00
elastic-loadbalancer CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic 2014-03-04 15:37:52 -08:00
f5 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
internal-loadbalancer Remove usage of sameOwner checkAccess invocation, and convert to 2014-04-01 17:31:56 -07:00
juniper-contrail Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account 2014-04-29 14:38:32 +05:30
juniper-srx Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
midonet 1) More fixes for the problems found by findBugs 2014-03-13 16:05:45 -07:00
netscaler CLOUDSTACK-6338 [Automation] Failed to NetScaler Device with error 2014-04-24 17:15:04 +05:30
nicira-nvp Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
opendaylight - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 2014-02-25 22:59:10 +01:00
ovs CLOUDSTACK-6431: OVS migrating vm to a new host added to the cluster 2014-04-25 17:21:30 +05:30
palo-alto Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
stratosphere-ssp - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 2014-02-25 22:59:10 +01:00
vxlan Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00