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 2021/03/03 08:52:55 UTC
[cloudstack] branch marvin3 updated (68b1d0b -> 2a89995)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch marvin3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
discard 68b1d0b another indentation issue identified
discard fb842ba another network for cleanup
discard 87fa793 cleanup incosistent passing test
discard fc8a937 rigorous cleanup discipline
discard c9ac079 cleanup and indentation
discard 590172e artifact tag removed
discard 5cfbf72 message attribute not available on exception
discard a95a205 endodestring can't consume a string, needs bytes
discard 7b8fd55 remove false copy-block
discard c434675 encodestring() instead of b64encode()
discard 4351645 cleanup and fix autoindent issues
discard 8371d90 Revert python version change from 3.8 to 3.9
discard b6fb287 Upgrade pip
discard 14efd3a Change python version due to cryptography
discard 5b21896 setuptools upgrade
discard cdccdbc nose to install (from before_install)
discard 8eec8c6 skip lifemigration for centos
discard ab4121d just to see
discard 0457f5d Update before_install.sh
discard 9d41c12 svm to p3
discard 2ced867 str f'ormat'
discard a65de5d pylint issues
discard 2724395 replace mock with unittest.mock
discard ee57796 pylint cmd debug
discard 0b462d5 Fix indentation issues and use python3 when running pycodestyle checker
discard 3288157 Make Virtual Router '.py' scripts Python3 compatible
discard 50fca5c reformat because of indentation problems
discard 5d48719 cleanup and feedback from internal version
discard c765672 retries on ssh verification
discard 12fc93f redundant braces removed
discard deebb7c cleanup
discard 75bd550 cleanup of setup() (not sure why this would help)
discard 2a62980 socketserver take bytes
discard d131bbb inherritics
discard 9df0a93 2to3 artifact/remnance removed
discard f0e7d51 exception assert fix
discard cb81644 remove superfluent parentesis
discard 7d9e327 str() when str() due
discard 1cd2679 foutje bedank: None vs 0
discard 45c7a58 unittest method rename assertItemEqual to assertCountEqual
discard e201412 awkward encode-decode of userdata
discard 4ff7aa1 only fetchall for select statements
discard c9e8bad Revert "add dep for python browsing in IDE"
discard 9233e33 mysql connector does not properly defend against index out of bounds
discard 4d9afe4 add dep for python browsing in IDE
discard 167b8ab start on tabs in component tests :'(
discard 136aef3 license exclude for pyenv
discard 8b2ff73 certificates as bytes arrays
discard 8cd37d5 pylint/travis trouble
discard 075ef6a version output in svm tests
discard 01696bd Revert "travis systemvm tests"
discard cc6849b separate python for systemvm (tests)
discard 47afc30 travis container does not inherit pylint either
discard 21d003d travis container does not inherit before_install stuff??
discard 0f1a2d6 travis prefered python version
discard d836f07 travis systemvm tests
discard f0a69fd remove nose-json
discard 9f5ac98 run py checkers as modules
discard c38a5ad backquote error calling pyenv
discard 5719989 fix tags on test
discard d92c92a channel result decode
discard 86442b6 no decode on str in python3
discard ca5e728 string checks in the nose plugin
discard e081664 pycodestyle2 and -lint2 in travis
discard 7c9a332 marvin deps on nose
discard 799e826 python3 in marvin rpm
discard 487e439 pyenv the right/requested version
discard 81dec6f pyton 3.9.1
discard 1b7e396 pyenv/travis alignment
discard 2e1ad9c travis scripts
discard 96f14ed None check
discard 5865990 add urllib3 to requirements in egg
discard 67b7e3d call codegenerator with python3
discard 783f1e5 python3 output on code generator
discard e6dcc9d urllib3
discard 6c70845 version3
discard 84ea139 travis on python 3
discard 568c901 env run of python3
discard fb74d20 remove redundant member value
discard bbf005d expect explicit exception
discard 3a4d983 explicit import of unittest
discard 1cf43fe init and sign
discard 7736bf0 2to3tests
discard 5861ce2 2to3marvin
add d0e71ad packaging: update Requirements in README (#4725)
add 1545bf8 ui: add missing antd component use (#4728)
add a234501 ui: Add guest IP ranges (#4716)
add fef0e66 ui: fix add Vmware cluster (#4663)
add 7874918 server: Look for active templates for VR deployment (#4047)
add af0f642 kvm: Suspending the VM prior to deleting snapshots to avoid corruption, th… (#4032)
add 88337bd server: fix finding pools for volume migration (#4693)
add e1f3179 Adjust tests to fix a problem with the container builders (https://github.com/khos2ow/cloudstack-deb-builder) (#4668)
add 7be87f1 Merge forward PR#4668 of Branch 4.13 on branch 4.14
add 569720f Merge forward PR#4668 of Branch 4.14 on branch 4.15
add 77290df Merge remote-tracking branch 'origin/4.15'
add 66f0bed Updating pom.xml version numbers for release 4.14.1.0
add 2e36e90 Merge tag '4.14.1.0' into 4.14
add fa067e0 Updating pom.xml version numbers for release 4.14.2.0-SNAPSHOT
add 2337854 Merge remote-tracking branch 'origin/4.14' into 4.15
add 19f3631 Merge remote-tracking branch 'origin/4.15'
add f8ad3ad cks: use HttpsURLConnection for checking api server (#4639)
add ebc529b Merge remote-tracking branch 'origin/4.15'
add 45e77dd server: Clean up the duplicate volume when the destination managed volume creation failed on migrate volume operation (#4730)
add 54290ee 2to3marvin
add b60c2ab 2to3tests
add feecfdc init and sign
add 797266f explicit import of unittest
add 853d1ec expect explicit exception
add c6abc0f remove redundant member value
add ef2fa11 env run of python3
add 02b81b7 travis on python 3
add 6699cac version3
add b247700 urllib3
add 6958926 python3 output on code generator
add 043efa7 call codegenerator with python3
add b1070b7 add urllib3 to requirements in egg
add 7c3afff None check
add 955c725 travis scripts
add d724ef5 pyenv/travis alignment
add 4d12263 pyton 3.9.1
add 685e215 pyenv the right/requested version
add 4e29543 python3 in marvin rpm
add 5ba7646 marvin deps on nose
add e041867 pycodestyle2 and -lint2 in travis
add 46fcd42 string checks in the nose plugin
add ba3569d no decode on str in python3
add d0f2fd7 channel result decode
add bbed4da fix tags on test
add 62461a5 backquote error calling pyenv
add b633e3e run py checkers as modules
add 7099a5e remove nose-json
add 22eaef1 travis systemvm tests
add bf15c09 travis prefered python version
add 994cd60 travis container does not inherit before_install stuff??
add 2b4daf6 travis container does not inherit pylint either
add 3a6b540 separate python for systemvm (tests)
add fe6a9a2 Revert "travis systemvm tests"
add 3ad890c version output in svm tests
add 51889a4 pylint/travis trouble
add 429743a certificates as bytes arrays
add f140c30 license exclude for pyenv
add 4900f88 start on tabs in component tests :'(
add cb8c857 add dep for python browsing in IDE
add 4834013 mysql connector does not properly defend against index out of bounds
add bb221b4 Revert "add dep for python browsing in IDE"
add 710c1a7 only fetchall for select statements
add 30eee15 awkward encode-decode of userdata
add 1499fa5 unittest method rename assertItemEqual to assertCountEqual
add 41fc44a foutje bedank: None vs 0
add ce5aef2 str() when str() due
add 3017943 remove superfluent parentesis
add a5cef933 exception assert fix
add f3d185f 2to3 artifact/remnance removed
add 7ff64d8 inherritics
add e96875cc socketserver take bytes
add 82e3142 cleanup of setup() (not sure why this would help)
add d520f28 cleanup
add 36dc3f4 redundant braces removed
add 1996f3f retries on ssh verification
add e0f4c16 cleanup and feedback from internal version
add e1dbe36 reformat because of indentation problems
add 14c87dc Make Virtual Router '.py' scripts Python3 compatible
add ead6147 Fix indentation issues and use python3 when running pycodestyle checker
add cb89159 pylint cmd debug
add 0d30014 replace mock with unittest.mock
add 786d3a9 pylint issues
add 5ef1902 str f'ormat'
add f4e908e svm to p3
add 028af7b Update before_install.sh
add aa4f328 just to see
add 874a142 skip lifemigration for centos
add 1d89a85 nose to install (from before_install)
add 236241e setuptools upgrade
add a5e3eab Change python version due to cryptography
add cfd84f8 Upgrade pip
add a32376f Revert python version change from 3.8 to 3.9
add 3eed87d cleanup and fix autoindent issues
add dc9b0d7 encodestring() instead of b64encode()
add 43de80d remove false copy-block
add 749005e endodestring can't consume a string, needs bytes
add 5af0652 message attribute not available on exception
add 9bd6e75 artifact tag removed
add 791d7f5 cleanup and indentation
add f5ebc69 rigorous cleanup discipline
add e6a7e25 cleanup incosistent passing test
add 9a7b18a another network for cleanup
add 2a89995 another indentation issue identified
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 (68b1d0b)
\
N -- N -- N refs/heads/marvin3 (2a89995)
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:
.../api/storage/StoragePoolAllocator.java | 10 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 3 +
.../storage/datastore/db/PrimaryDataStoreDao.java | 2 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 13 +
.../allocator/AbstractStoragePoolAllocator.java | 14 +-
.../ClusterScopeStoragePoolAllocator.java | 6 +-
.../GarbageCollectingStoragePoolAllocator.java | 4 +-
.../allocator/LocalStoragePoolAllocator.java | 4 +-
.../allocator/UseLocalForRootAllocator.java | 7 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 6 +-
.../storage/volume/VolumeServiceImpl.java | 18 +-
packaging/README.md | 4 +-
.../cloudstack/ca/provider/RootCAProviderTest.java | 15 +-
.../LibvirtDeleteVMSnapshotCommandWrapper.java | 36 ++-
.../kvm/storage/KVMStorageProcessor.java | 2 +-
.../cluster/utils/KubernetesClusterUtil.java | 20 +-
.../allocator/RandomStoragePoolAllocator.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 123 ++++++---
ui/src/config/section/network.js | 4 +
ui/src/core/lazy_lib/components_use.js | 6 +-
ui/src/views/infra/ClusterAdd.vue | 26 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 8 +-
ui/src/views/infra/network/TrafficTypesTab.vue | 4 +-
ui/src/views/network/CreateVlanIpRange.vue | 285 +++++++++++++++++++++
ui/src/views/network/GuestIpRanges.vue | 196 ++++++++++++++
25 files changed, 738 insertions(+), 80 deletions(-)
create mode 100644 ui/src/views/network/CreateVlanIpRange.vue
create mode 100644 ui/src/views/network/GuestIpRanges.vue