Rajani Karuturi f741d99c80 CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now. ...

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>

2014-01-09 15:50:53 +05:30

..

api

CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be

2014-01-08 17:43:06 -08:00

components-api

CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network

2014-01-06 17:22:17 -08:00

network

Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.

2013-11-21 07:56:47 -08:00

orchestration

CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be

2014-01-08 17:43:06 -08:00

schema

CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now.

2014-01-09 15:50:53 +05:30

service

Bump 4.3.0 to 4.4.0 in master

2013-11-21 16:01:15 +01:00

storage

CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be

2014-01-08 17:43:06 -08:00

pom.xml

Bump 4.3.0 to 4.4.0 in master

2013-11-21 16:01:15 +01:00