Rohit Yadav 7ff31f1b22 Merge remote-tracking branch 'origin/inetaddress' ... - Tested locally against unit tests - TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351 - Manual QA passed for basic auth and saml auth using default IDP settings Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: server/src/com/cloud/api/ApiServlet.java		2014-11-25 14:32:09 +05:30
..
com/cloud	Merge remote-tracking branch 'origin/inetaddress'	2014-11-25 14:32:09 +05:30
org	removed executable flags from java classes	2014-11-23 19:49:01 +01:00
resources	CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation	2014-11-13 09:55:49 -05:00
async-job-component.xml	Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin	2014-06-07 04:50:23 -04:00
sync-queue-component.xml	License header updates for the server folder.	2012-08-03 09:41:27 -04:00