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
..
acl/static-role-based	Remove old APIs and old security checker plugins. Also use QuerySelector	2014-01-10 14:54:31 -08:00
affinity-group-processors	1) More fixes for the problems found by findBugs	2014-03-13 16:05:45 -07:00
alert-handlers	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
api	Merge branch 'master' into rbac.	2014-03-06 14:02:20 -08:00
database/mysql-ha	Fix pom relative path	2014-03-28 09:36:21 +01:00
dedicated-resources	- 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
deployment-planners	All Checkstyle problems corrected	2013-12-12 12:26:07 -08:00
event-bus	CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus	2014-04-09 17:33:48 +05:30
file-systems/netapp	- 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
ha-planners/skip-heurestics	CLOUDSTACK-4941:	2013-12-18 16:27:20 -08:00
host-allocators/random	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
hypervisors	CLOUDSTACK-6170 Needed to add logic for XS 6.2 + XS62ESP1 + XS62ESP1004	2014-04-28 23:31:08 -06:00
network-elements	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 14:38:32 +05:30
storage	fix build	2014-03-27 17:38:42 -07:00
storage-allocators/random	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
user-authenticators	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 14:38:32 +05:30
pom.xml	cloudbyte storage plugin for master commit	2014-03-19 16:37:49 -07:00