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
..
resources/META-INF/cloudstack	Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package	2014-01-21 17:19:52 -08:00
src	Merge remote-tracking branch 'origin/inetaddress'	2014-11-25 14:32:09 +05:30
test	Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences	2014-11-13 17:26:24 +05:30
pom.xml	Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT	2014-10-29 14:54:23 +01:00