You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/01/13 08:37:38 UTC
[cloudstack] branch health-4.13 updated (58ebcf2 -> f7df05e)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch health-4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
discard 58ebcf2 please do not merge this;)
add c75c228 Honour promiscuous mode from networkOffering (#3765)
add 5afff61 create template from snapshot regression (partly reverted) (#3767)
add 0b34971 Once again allow a VM to be on multiple networks from VPCs (#3754)
add 90ce1d8 convert protocal names to be found as labels (#3747)
add 3ac03c8 filter hosts to query on zone wide storage (#3733)
add 2712dec config: add isdynamic flag in configuration response (#3729)
add 1003085 Added zone check for attach iso (#3755)
add 8844f59 break session only on illegal origin (#3715)
add 75ccb53 network: cleanup dhcp/dns entries while remove a nic from vm (#3721)
add 7e64945 kvm: Logrotate should not touch agent.log (#3597)
add cca6608 ui: fix for truncated name for project accounts (#3793)
add 2ffc0c5 Increase DHCP lease time to infinite (#3662)
add 02714f2 client: jetty session timeout set after server is started (#3658)
add 701f606 ui: fix migrate host form no host popup (#3682)
add d44dc07 only update powerstate if sure it is the latest (#3743)
add 005019b Endless settings on templates and instances (#3778)
add f7df05e please do not merge this;)
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 (58ebcf2)
\
N -- N -- N refs/heads/health-4.13 (f7df05e)
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:
agent/conf/cloudstack-agent.logrotate.in | 5 +-
...edException.java => OriginDeniedException.java} | 34 +++----
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/response/ConfigurationResponse.java | 13 +++
.../java/org/apache/cloudstack/ServerDaemon.java | 14 ++-
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 41 +++++++--
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 45 ++++++---
.../engine/orchestration/NetworkOrchestrator.java | 20 ++--
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 6 +-
.../hypervisor/vmware/resource/VmwareResource.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 1 +
server/src/main/java/com/cloud/api/ApiServer.java | 15 +--
.../com/cloud/template/TemplateManagerImpl.java | 6 ++
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 23 ++---
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 12 ++-
ui/css/cloudstack3.css | 5 +-
ui/scripts/globalSettings.js | 4 +-
ui/scripts/instances.js | 13 ++-
ui/scripts/network.js | 3 +-
ui/scripts/sharedFunctions.js | 102 +++++++++++++++++++++
ui/scripts/storage.js | 2 +-
ui/scripts/templates.js | 7 ++
.../java/com/cloud/utils/SerialVersionUID.java | 1 +
25 files changed, 283 insertions(+), 96 deletions(-)
copy api/src/main/java/com/cloud/exception/{PermissionDeniedException.java => OriginDeniedException.java} (59%)