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	removed executable flags from java classes	2014-11-23 19:49:01 +01:00
org/apache/cloudstack	Merge remote-tracking branch 'origin/inetaddress'	2014-11-25 14:32:09 +05:30