This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 5ed9ca239a1 do not merge
add a1af03f4133 noVNC: fix JP keyboard on vmware7+ which uses websocket
URL (#7694)
add fa58f59619c kvm: Added VNI Devices as normal bridge slave devs (#7836)
add b32ba953cff test: upgrade kubernetes versions to 1.25.0/1.26.0 (#7685)
add fdb23dae40f server: Use max secondary storage defined on the account
during upload (#7441)
add 1605b2f0dbd server: remove registered userdata when cleanup an account
(#7777)
add 7b64236469c Merge release branch 4.18 to main
add 9bc0dd7a690 pre-commit fix line ending (#7851)
add d9319e645c7 storpool: fix pom.xml which caused docker image build
failures (#7845)
add 29c7b3167eb cloudstack: bump to use 4.18.1.0 systemvmtemplate (#7828)
add 540dcc1040a Merge remote-tracking branch 'apache/4.18'
add f3cf74be1d1 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 (5ed9ca239a1)
\
N -- N -- N refs/heads/dummy (f3cf74be1d1)
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:
.../java/com/cloud/user/ResourceLimitService.java | 9 +
.../main/java/com/cloud/user/dao/UserDataDao.java | 2 +
.../java/com/cloud/user/dao/UserDataDaoImpl.java | 7 +
.../kvm/resource/LibvirtComputingResource.java | 3 +-
plugins/storage/volume/storpool/pom.xml | 26 +
pom.xml | 2 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 12 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 18 +-
.../cloud/template/HypervisorTemplateAdapter.java | 16 +-
.../java/com/cloud/user/AccountManagerImpl.java | 7 +
.../consoleproxy/ConsoleAccessManagerImpl.java | 7 +-
.../com/cloud/user/AccountManagerImplTest.java | 1 +
.../com/cloud/user/AccountManagetImplTestBase.java | 3 +
.../cloud/vpc/MockResourceLimitManagerImpl.java | 5 +
systemvm/agent/noVNC/app/ui.js | 1 +
systemvm/agent/noVNC/core/rfb.js | 62 ++
.../noVNC/keymaps/generate-language-keymaps.py | 127 +++
systemvm/agent/noVNC/keymaps/keymap-ja | 995 +++++++++++++++++++++
systemvm/agent/noVNC/keymaps/keymap-ja-atset1.js | 102 +++
test/integration/smoke/test_kubernetes_clusters.py | 41 +-
.../smoke/test_kubernetes_supported_versions.py | 3 +-
.../scripts/configure_systemvm_services.sh | 2 +-
tools/appliance/systemvmtemplate/template.json | 2 +-
tools/marvin/marvin/config/test_data.py | 15 +
24 files changed, 1427 insertions(+), 41 deletions(-)
create mode 100755 systemvm/agent/noVNC/keymaps/generate-language-keymaps.py
create mode 100644 systemvm/agent/noVNC/keymaps/keymap-ja
create mode 100644 systemvm/agent/noVNC/keymaps/keymap-ja-atset1.js
