etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins
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
..
acl/static-role-based Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
affinity-group-processors Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
alert-handlers CLOUDSTACK-7620: Added SNMP MIB file for snmp-alerts plugin 2014-11-17 15:11:31 +05:30
api removed executable flags from java classes 2014-11-23 19:49:01 +01:00
database/mysql-ha Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
dedicated-resources removed executable flags from java classes 2014-11-23 19:49:01 +01:00
deployment-planners removed executable flags from java classes 2014-11-23 19:49:01 +01:00
event-bus Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
file-systems/netapp Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
ha-planners/skip-heurestics Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
host-allocators/random removed executable flags from java classes 2014-11-23 19:49:01 +01:00
hypervisors removed executable flags from java classes 2014-11-23 19:49:01 +01:00
network-elements Merge remote-tracking branch 'origin/inetaddress' 2014-11-25 14:32:09 +05:30
storage removed executable flags from java classes 2014-11-23 19:49:01 +01:00
storage-allocators/random Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
user-authenticators Use InetAddress for passing Remote Address instead of String 2014-11-21 12:10:35 +01:00
pom.xml Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00