etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
History
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
..
conf Summary: Updated sudoers approved commands for cloud user 2013-10-23 13:42:16 -07:00
resources refactor all private methods in the virtual router appliance and VPC appliance 2014-10-14 15:08:09 +02:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src Merge remote-tracking branch 'origin/inetaddress' 2014-11-25 14:32:09 +05:30
test Merge remote-tracking branch 'origin/inetaddress' 2014-11-25 14:32:09 +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