This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch 4.19-dummy in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard ce2bc67e5ca do not merge add 083ac069ca4 fix assignvm template permission check (#8886) add 60f234c682d remove Project Template Permissions inhibition (#9196) add 0c422aca767 server: fix additional zones cannot be removed (#9261) add 674495b162b Fixup startVM on simulator (#9199) add 313a165e62b server: add global setting consoleproxy.sslEnabled (#8809) add 9055610034b Remove duplicate network state checks before shutdown network (#8462) add 4b668d66e54 do not merge This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ce2bc67e5ca) \ N -- N -- N refs/heads/4.19-dummy (4b668d66e54) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../engine/orchestration/NetworkOrchestrator.java | 17 +- .../orchestration/NetworkOrchestratorTest.java | 272 ++++++++++++--------- .../storage/datastore/db/ImageStoreDaoImpl.java | 2 +- .../com/cloud/agent/manager/MockVmManagerImpl.java | 79 +++--- .../AgentBasedConsoleProxyManager.java | 2 +- .../java/com/cloud/consoleproxy/AgentHookBase.java | 2 +- .../cloud/consoleproxy/ConsoleProxyManager.java | 3 + .../consoleproxy/ConsoleProxyManagerImpl.java | 4 +- .../consoleproxy/StaticConsoleProxyManager.java | 2 +- .../com/cloud/template/TemplateManagerImpl.java | 7 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 5 +- ui/src/views/compute/DeployVM.vue | 2 + 12 files changed, 210 insertions(+), 187 deletions(-)