mirror of https://github.com/apache/cloudstack.git
Merge remote-tracking branch 'apache/4.17' into main
This commit is contained in:
commit
d9b770eb48
|
|
@ -50,7 +50,7 @@ public class UpdateCfgCmd extends BaseCmd {
|
|||
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the configuration")
|
||||
private String cfgName;
|
||||
|
||||
@Parameter(name = ApiConstants.VALUE, type = CommandType.STRING, description = "the value of the configuration", length = 4095)
|
||||
@Parameter(name = ApiConstants.VALUE, type = CommandType.STRING, description = "the value of the configuration", length = 4096)
|
||||
private String value;
|
||||
|
||||
@Parameter(name = ApiConstants.ZONE_ID,
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class AccountDetailVO implements InternalIdentity {
|
|||
private String name;
|
||||
|
||||
@Encrypt
|
||||
@Column(name = "value")
|
||||
@Column(name = "value", length=4096)
|
||||
private String value;
|
||||
|
||||
protected AccountDetailVO() {
|
||||
|
|
|
|||
|
|
@ -126,3 +126,6 @@ CREATE VIEW `cloud`.`domain_router_view` AS
|
|||
`cloud`.`async_job` ON async_job.instance_id = vm_instance.id
|
||||
and async_job.instance_type = 'DomainRouter'
|
||||
and async_job.job_status = 0;
|
||||
|
||||
-- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size
|
||||
ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL;
|
||||
|
|
@ -536,6 +536,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
|
|||
}
|
||||
|
||||
public MemStat getMemStat() {
|
||||
_memStat.refresh();
|
||||
return _memStat;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue