git commit: updated refs/heads/master to 68fda5a

Updated Branches: refs/heads/master a354d969c -> 68fda5a8d Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/clou

git commit: updated refs/heads/master to a354d96

Updated Branches: refs/heads/master 929838c8e -> a354d969c Merge from 4.3: CLOUDSTACK-5823: Taking a VMware snapshot doesn't work Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a354d969 Tree: http://git-wip-us.ap

svn commit: r893515 [3/3] - in /websites/staging/cloudstack/trunk/content: ./ docs/en-US/ docs/en-US/Apache_CloudStack/4.2.1/ docs/en-US/Apache_CloudStack/4.2.1/epub/ docs/en-US/Apache_CloudStack/4.2.

Added: websites/staging/cloudstack/trunk/content/docs/en-US/Apache_CloudStack/4.2.1/html/Release_Notes/Common_Content/images/8.svg == Binary file - no diff available. Propchange: websites/staging/cloudstack/trunk/content

svn commit: r1557030 - /cloudstack/site/trunk/content/docs/en-US/toc.html

Author: ke4qqq Date: Fri Jan 10 04:54:34 2014 New Revision: 1557030 URL: http://svn.apache.org/r1557030 Log: fixing a stupid link error Modified: cloudstack/site/trunk/content/docs/en-US/toc.html Modified: cloudstack/site/trunk/content/docs/en-US/toc.html URL: http://svn.apache.org/viewvc/c

svn commit: r893517 - in /websites/staging/cloudstack/trunk/content: ./ docs/en-US/toc.html

Author: buildbot Date: Fri Jan 10 05:00:35 2014 New Revision: 893517 Log: Staging update by buildbot for cloudstack Modified: websites/staging/cloudstack/trunk/content/ (props changed) websites/staging/cloudstack/trunk/content/docs/en-US/toc.html Propchange: websites/staging/cloudstack

git commit: updated refs/heads/master to 6944bf9

Updated Branches: refs/heads/master ae35782cc -> 6944bf9bb Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6944bf

git commit: updated refs/heads/master to 929838c

Updated Branches: refs/heads/master 7ef78aac4 -> 929838c8e Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92983

svn commit: r893518 - /websites/production/cloudstack/content/

Author: ke4qqq Date: Fri Jan 10 05:11:01 2014 New Revision: 893518 Log: Publishing svnmucc operation to cloudstack site by ke4qqq Added: websites/production/cloudstack/content/ - copied from r893517, websites/staging/cloudstack/trunk/content/

git commit: updated refs/heads/master to 7ef78aa

Updated Branches: refs/heads/master 6944bf9bb -> 7ef78aac4 Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ef78

svn commit: r893514 - in /websites/staging/cloudstack/trunk/content: ./ docs/toc.html

Author: buildbot Date: Fri Jan 10 04:47:07 2014 New Revision: 893514 Log: Staging update by buildbot for cloudstack Added: websites/staging/cloudstack/trunk/content/docs/toc.html (with props) Modified: websites/staging/cloudstack/trunk/content/ (props changed) Propchange: websites/st

svn commit: r1557029 - in /cloudstack/site/trunk/content/docs/en-US/Apache_CloudStack/4.2.1: ./ pdf/Release_Notes/Apache_CloudStack-4.2.0-Release_Notes-en-US.pdf

Author: ke4qqq Date: Fri Jan 10 04:45:10 2014 New Revision: 1557029 URL: http://svn.apache.org/r1557029 Log: adding 4.2.1 docs Added: cloudstack/site/trunk/content/docs/en-US/Apache_CloudStack/4.2.1/ - copied from r1557023, cloudstack/docsite/html/docs/en-US/Apache_CloudStack/4.2.1/ Re

svn commit: r1557028 - /cloudstack/site/trunk/content/docs/en-US/toc.html

Author: ke4qqq Date: Fri Jan 10 04:44:02 2014 New Revision: 1557028 URL: http://svn.apache.org/r1557028 Log: adding more 4.2.1 stuff Modified: cloudstack/site/trunk/content/docs/en-US/toc.html Modified: cloudstack/site/trunk/content/docs/en-US/toc.html URL: http://svn.apache.org/viewvc/clou

svn commit: r1557026 - /cloudstack/site/trunk/content/docs/toc.html

Author: ke4qqq Date: Fri Jan 10 04:41:52 2014 New Revision: 1557026 URL: http://svn.apache.org/r1557026 Log: 4.2.1 adds Added: cloudstack/site/trunk/content/docs/toc.html - copied, changed from r1557024, cloudstack/docsite/html/docs/en-US/toc.html Copied: cloudstack/site/trunk/content

svn commit: r893513 - in /websites/staging/cloudstack/trunk/content: ./ docs/toc.html

Author: buildbot Date: Fri Jan 10 04:39:16 2014 New Revision: 893513 Log: Staging update by buildbot for cloudstack Removed: websites/staging/cloudstack/trunk/content/docs/toc.html Modified: websites/staging/cloudstack/trunk/content/ (props changed) Propchange: websites/staging/cloudst

svn commit: r1557025 - /cloudstack/site/trunk/content/docs/toc.html

Author: ke4qqq Date: Fri Jan 10 04:32:53 2014 New Revision: 1557025 URL: http://svn.apache.org/r1557025 Log: removing toc.html Removed: cloudstack/site/trunk/content/docs/toc.html

svn commit: r1557024 - /cloudstack/docsite/html/docs/en-US/toc.html

Author: ke4qqq Date: Fri Jan 10 04:22:55 2014 New Revision: 1557024 URL: http://svn.apache.org/r1557024 Log: toc.html for new 4.2.1 RN Modified: cloudstack/docsite/html/docs/en-US/toc.html Modified: cloudstack/docsite/html/docs/en-US/toc.html URL: http://svn.apache.org/viewvc/cloudstack/doc

svn commit: r1557023 [3/3] - in /cloudstack/docsite/html/docs/en-US/Apache_CloudStack/4.2.1: ./ epub/ epub/Release_Notes/ html-single/ html-single/Release_Notes/ html-single/Release_Notes/Common_Conte

Added: cloudstack/docsite/html/docs/en-US/Apache_CloudStack/4.2.1/html/Release_Notes/Common_Content/images/3.png URL: http://svn.apache.org/viewvc/cloudstack/docsite/html/docs/en-US/Apache_CloudStack/4.2.1/html/Release_Notes/Common_Content/images/3.png?rev=1557023&view=auto ==

git commit: updated refs/heads/4.3 to eef4a89

Updated Branches: refs/heads/4.3 d758996b7 -> eef4a8957 fix devcloud router start Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eef4a895 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eef4a895 Dif

[1/4] Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.

Updated Branches: refs/heads/master 64b8d1044 -> bc1eec9f7 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae8560b1/usage/test/resources/cloud3.xml -- diff --git a/usage/test/resources/cloud3.xml b/usage/test/resources/c

[4/4] git commit: updated refs/heads/master to bc1eec9

Fixed a missing package name Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bc1eec9f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bc1eec9f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff

[3/4] git commit: updated refs/heads/master to bc1eec9

Changed the package to name to org.apache.cloudstack Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fb6edd6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fb6edd6 Diff: http://git-wip-us.apache.org/r

git commit: updated refs/heads/4.2 to 9f03150

Updated Branches: refs/heads/4.2 3af4cf448 -> 9f03150a4 CLOUDSTACK-5653:S3 object store as Secondary Storage, the template created from different zone is not available for the other zones. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repo

git commit: updated refs/heads/4.3 to d758996

Updated Branches: refs/heads/4.3 9583c47a3 -> d758996b7 CLOUDSTACK-5656: UI > network > IP Address > configuration tab > Port Forwarding > add "State" column. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d758

[1/2] fix devcloud: get back whatever we have before

Updated Branches: refs/heads/4.3 d11560d27 -> 9583c47a3 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9583c47a/scripts/vm/hypervisor/xenserver/xcposs/vmopsSnapshot -- diff --git a/scripts/vm/hypervisor/xenserver/xcposs

git commit: updated refs/heads/master to 64b8d10

Updated Branches: refs/heads/master 8b6e89c01 -> 64b8d1044 CLOUDSTACK-5819:extractTemplate fails with Vmware host on migration of NFS to S3. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64b8d104 Tree: http://g

git commit: updated refs/heads/4.3 to d11560d

Updated Branches: refs/heads/4.3 277b93c19 -> d11560d27 CLOUDSTACK-5557: UI > Network > Guest Network > IP Address > fix a bug that SourceNAT IP, VPC tier IP wrongly showed Configuration tab(firewall/portforwarding/loadbalancing). SourceNAT IP, VPC tier IP should not show Configuration tab(

Jenkins build is back to normal : cloudstack-rat-master #3784

See

git commit: updated refs/heads/master to 8b6e89c

Updated Branches: refs/heads/master 1e2e1ea05 -> 8b6e89c01 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/clo

git commit: updated refs/heads/4.3 to 277b93c

Updated Branches: refs/heads/4.3 9a4a2911d -> 277b93c19 CLOUDSTACK-5840: UI > Snapshots > create volume from snapshot dialog > add zone dropdown if region-wide secondary storage exists. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos

[03/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-5669: Always retrieve the most recent job result in OutComeImpl Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/832c8e47 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/832c8e47 Diff: http://g

[09/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/87381d42 Tree: http://git-wip-us.apache.

[11/13] git commit: updated refs/heads/master to 1e2e1ea

Fix a typo caused problem in attach-volume process Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/737a382c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/737a382c Diff: http://git-wip-us.apache.org/rep

[01/13] git commit: updated refs/heads/master to 1e2e1ea

Updated Branches: refs/heads/master a298f6fce -> 1e2e1ea05 CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0965adb0 Tree: http://git-wip-us.

[12/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e2e1ea0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e2e1ea0 Diff: ht

[08/13] git commit: updated refs/heads/master to 1e2e1ea

Fix auto-merge caused issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac0faeb0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac0faeb0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff

[13/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-5752: Use pesudo job context when API dispather directly calls into orchestration flow Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a05d71a8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree

[05/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c93bd60 Tree: http://git-wip-us.apache.org/repos/asf/clou

[06/13] git commit: updated refs/heads/master to 1e2e1ea

Fix a style-check problem after cherry-pick Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a6f126d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a6f126d2 Diff: http://git-wip-us.apache.org/repos/asf/

[02/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-5726: Using runtime discovered dao (in AsyncJobManagerImpl.submitAsyncJob) to persist record has a problem to locate the right DAO instance, it causes corrupted field value be stored in database. Put in a work-around fix first to always initialize record fields in all cases Project:

[07/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05873822 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05873822 Dif

[10/13] git commit: updated refs/heads/master to 1e2e1ea

CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad6454d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tr

git commit: updated refs/heads/master to a298f6f

Updated Branches: refs/heads/master caf87ac5d -> a298f6fce Merge from 4.3: CLOUDSTACK-5468: Configuration property should be optional Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a298f6fc Tree: http://git-wip-u

git commit: updated refs/heads/master to caf87ac

Updated Branches: refs/heads/master 03118c296 -> caf87ac5d Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/clou

git commit: updated refs/heads/4.3 to 9a4a291

Updated Branches: refs/heads/4.3 644a9bc53 -> 9a4a2911d CLOUDSTACK-5819:extractTemplate fails with Vmware host on migration of NFS to S3. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a4a2911 Tree: http://git-

git commit: updated refs/heads/master to 03118c2

Updated Branches: refs/heads/master 09da5153d -> 03118c296 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/clo

git commit: updated refs/heads/4.3 to 644a9bc

Updated Branches: refs/heads/4.3 072581b09 -> 644a9bc53 CLOUDSTACK-5840: UI > Secondary Storages > remove "prepareObjectStoreMigration" action (since prepareSecondaryStorageForMigration API has been removed from server-side). Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo C

git commit: updated refs/heads/master to 09da515

Updated Branches: refs/heads/master c69a412c4 -> 09da5153d Update infrastructure 'socket' icon Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09da5153 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree

git commit: updated refs/heads/master to c69a412

Updated Branches: refs/heads/master 0e315f16c -> c69a412c4 Remove old prepareSecondaryStorageForMigration from gen_toc.py. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c69a412c Tree: http://git-wip-us.apache.o

git commit: updated refs/heads/4.3 to 072581b

Updated Branches: refs/heads/4.3 ac68ebd63 -> 072581b09 Remove old prepareSecondaryStorageForMigration from gen_toc.py. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/072581b0 Tree: http://git-wip-us.apache.org/r

[1/2] git commit: updated refs/heads/4.3 to ac68ebd

Updated Branches: refs/heads/4.3 d5277a81e -> ac68ebd63 refs/heads/master 7c8facf3c -> 0e315f16c CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http:

[2/2] git commit: updated refs/heads/master to 0e315f1

CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e315f16 Tree: http://git-wip-us.apache.org/repos/a

git commit: updated refs/heads/master to 7c8facf

Updated Branches: refs/heads/master 1b5f8e21a -> 7c8facf3c Change checkstyle to run on every sub project, so it will also run when you build an individual module Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7

git commit: updated refs/heads/master to 1b5f8e2

Updated Branches: refs/heads/master 3baf61161 -> 1b5f8e21a Fix typo Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b5f8e21 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b5f8e21 Diff: http://git-

git commit: updated refs/heads/master to 3baf611

Updated Branches: refs/heads/master f012a2655 -> 3baf61161 CLOUDSTACK-5846: added updateCloudToUseObjectStore to known_category dict in gen_toc.py Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/as

git commit: updated refs/heads/master to f012a26

Updated Branches: refs/heads/master d56a96244 -> f012a2655 CLOUDSTACK-5404: Fix timezone bug in network usage (cherry picked from commit d5277a81e644c6db30cff12878cd3708aa28cc86) Conflicts: engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java Project: http://git-wip-us.apache.org

git commit: updated refs/heads/4.2 to 3af4cf4

Updated Branches: refs/heads/4.2 418f8cb60 -> 3af4cf448 CLOUDSTACK-5404: Fix timezone bug in network usage (cherry picked from commit d5277a81e644c6db30cff12878cd3708aa28cc86) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/clouds

git commit: updated refs/heads/4.3 to d5277a8

Updated Branches: refs/heads/4.3 15cec79b5 -> d5277a81e CLOUDSTACK-5404: Fix timezone bug in network usage Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d5277a81 Tree: http://git-wip-us.apache.org/repos/asf/clo

git commit: updated refs/heads/4.3 to 15cec79

Updated Branches: refs/heads/4.3 12f3568e9 -> 15cec79b5 CLOUDSTACK-5846: added updateCloudToUseObjectStore to known_category dict in gen_toc.py Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/c

git commit: updated refs/heads/master to d56a962

Updated Branches: refs/heads/master f741d99c8 -> d56a96244 Radvd is needed in the template so we can start testing with IPv6 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d56a9624 Tree: http://git-wip-us.apache

[2/2] git commit: updated refs/heads/master to f741d99

Revert "CLOUDSTACK-5435 enabled encryption for ldap params" This reverts commit 1d5051f60e0b302287f4fd806a84e65afc7494d0. Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/001e67ab

[1/2] git commit: updated refs/heads/master to f741d99

Updated Branches: refs/heads/master 7dc4c5cb5 -> f741d99c8 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 Project: http://git-

[1/2] git commit: updated refs/heads/4.3 to 12f3568

Updated Branches: refs/heads/4.3 7584cf906 -> 12f3568e9 CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now. Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/rep

[2/2] git commit: updated refs/heads/4.3 to 12f3568

Revert "CLOUDSTACK-5435 enabled encryption for ldap params" This reverts commit 24392c15f561fa07fd5f707bbfa6910d880c3a3b. Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfabe233