Age | Commit message (Collapse) | Author | Files | Lines |
|
Instead of fetching remote branch head, stick to commits we bound to
in Armband.
This prevents further breakage when our submodules are updated
upstream.
Change-Id: I231aa4458bfea51608400d3a6c7d670f4413176d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I93156463e63d71e8b32446b3dfbfe61a7929bf38
Signed-off-by: cristinapauna <cristina.pauna@enea.com>
(cherry picked from commit 338930ba2825fcc88b184cf4f3e8c37beab5f9be)
|
|
This is the first update on documentation for C3 release
Mostly updated the links and Jira filters
Change-Id: Idd4d6dd92b1ff3972bbcfb1f8b49e547160b6ed9
Signed-off-by: cristinapauna <cristina.pauna@enea.com>
(cherry picked from commit b5e0bf0371eb983a3160a53d17f2642e35e7180a)
|
|
On arm64, JVM sometimes (~10%) crashes at the very start, due to
JIT issues in our openjdk8 package.
We can't really solve the JVM on arm64 issues in the near future,
so we will try to work around the issue by configuring the ODL
service as respawn-able (see [1] for more details).
Note: This is specific to Ubuntu Trusty (14.04), which uses upstart,
for Ubuntu Xenial (or anything else >14.x), which uses systemd,
a different, equivalent mechanism should be used.
[1] http://upstart.ubuntu.com/cookbook/#respawn
JIRA: ARMBAND-134
Change-Id: I0dc82e4a6d0cc485e981477e6a25dbad95db930b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 57675c1505d8d64dd6e0308b18a1b404f978fa7a)
|
|
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Update documentation for Colorado 3.0
JIRA: FUEL-235
Change-Id: I6dd3a290179bd2b29e07dd0b72c2c007acd8682d
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
(cherry picked from commit e718839e1e94fd69e1a2222225fce3ef2da868c2)
|
|
Prepare support for caching deploy artifacts, like bootstraps and
target images, which take a lot of time at each deploy to be built,
considering it requires a cross-debootstrap via qemu-user-static and
binfmt.
NOTE: THIS IS JUST A STUB. Full implementation will be cherry-picked
from master after proper testing, but we need to implement arg
support so we don't break on unknown "-C" arg passed down from Releng.
JIRA: ARMBAND-172
Change-Id: Id2229767eb423df11784bb7621499902387d2f69
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
stable/colorado
* changes:
fuel-plugin-opendaylight: Prebuilt leveldbjni DEB
f_odlpluginbuild: Armband prereq in packages.yaml
|
|
|
|
Switch from deploy time building of leveldb + leveldbjni to
using a prebuilt artifact, shipped as a DEB package from Armband
repos.
JIRA: ARMBAND-114
Conflicts:
patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
Change-Id: Ic7a52c78e803c1a6ebda1f127774959a0880a5a3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
NOTE: Temporarily patch "packetary" in Armband until we upstream
two small fixes.
Bootstrap build, deploy target image build:
- Switch from public Ubuntu mirrors to 10.20.0.2.
Squash master fixes:
- f_repobuild: Fixup missing OPNFV plugin deps
Packetary solves "libasound2" with "liboss4-salsa-asound2" from
universe, leading to openjdk failing to install.
Work around this by altering recently introduced packetary-driven
local mirror build to include OPNFV plugin deps into "main" comp.
- local mirror: Add missing vgabios for arm64
JIRA: ARMBAND-35
JIRA: ARMBAND-169
Conflicts:
.gitmodules
armband-fuel-config.mk
patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
Change-Id: I14645cfeebb486063e7b8198de273f68285b11cd
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
We need to explicitily add our Armband leveldb patching prereq
tools, like maven, git, make etc. to the ODL plugin's packages.yaml,
so they are included in the offline Ubuntu mirror.
While at it, also add openjdk-8-jre amos version additional dep:
- libasound2
JIRA: ARMBAND-167
Change-Id: I17fa7a4727b8a553f5a46ab13267380a8864c728
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit adf8af4f0edfa3cde7a61b5c8af8379fafa5a7b6)
|
|
Upstream Fuel@OPNFV recently set the git change for upstream
fuel-plugin-ovs git repo, aside from setting branch to stable/9.0.
This led to Armband patches being silently ignored and building
an "amd64"-only version of the OVS plugin in Armband.
NOTE: Since Armband uses git submodules to track the patches plugins,
including fuel-plugin-ovs, we automatically fetch latest branch HEAD
from upstream plugins (by using `git submodules update --remote`), so
the Fuel recent pinning is bypassed anyway.
JIRA: ARMBAND-166
Change-Id: Ide96f16f9b2577fc184c759dd153298df0be24c6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Uplift fuel-plugin-ovs for c3.0
Change-Id: I564419c17ead0bd522d479b08606cdfbcbc6d8c1
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
|
|
When deploying via Jenkins CI, the repos used for target image
building are overridden to use the local Ubuntu mirror on Fuel
Master instead of fetching packages from internet.
However, when deploying manually, only bootstrap image building
benefits from the local Ubuntu mirror.
While keeping the internet mirrors, add the local Ubuntu mirror
to target image build repo list.
The first commit (bcdc1eaa74d5efd5f8c80600fb30d722bae9a421) confused
the URL of the local Ubuntu mirror with the local MOS mirror, so I
also cherry-picked a fixup on top.
JIRA: ARMBAND-35
Change-Id: Ibd58067703ce6370781a6b54fd01ce52e29686ac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit bcdc1eaa74d5efd5f8c80600fb30d722bae9a421)
(cherry picked from commit 489b1cb8de7d47c818475f8830e3ea689365e2b3)
|
|
JIRA: ARMBAND-96
Conflicts:
patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch
Change-Id: I28ab3030d3f31c5734508838985412a33334570a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Typo fixes
Change-Id: I189dd771f9985424694ca0164c6e42f117f12bf9
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
(cherry picked from commit d4b0f79649da3ad7a3f3f59d3b92ea230f5b1826)
|
|
Previously, fuel-plugin-ovs did not have a stable branch for Fuel 9,
but now it does, and since fuel-plugin-ovs/master was reworked for
Fuel 10, we need to switch to it.
v1 -> v2: Backported one patch that was not cherry-picked on stable.
Conflicts:
.gitmodules
Change-Id: I58467e441763b35e5296cb29433eb941e65eec3f
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- [virtual envs] Switch to raw images
* use raw devices instead of qcow2
* disable i/o caching, it reduces data copies and bus traffic
* set native aio instead of thread based
JIRA: FUEL-201
Change-Id: I8ac728cbb5be5948080fab8ae4d3d311e0a5c09c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit ed79331c115eac4aad0eccd4b191c9e1e836c73d)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "Revert "Disable public ping_checker resource by default"" into stable/colorado
- Revert "Disable public ping_checker resource by default"
JIRA: FUEL-217
This reverts commit c5b7a198f1d69fd591696cc8e0c6ef81c6557ea4.
Change-Id: I99570e9dc0fcfd452410809130a843230f28c178
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Shift public ping checker into deployment stage
Avoid public vip failover at the end of post-deployment
by moving ping_checker resource into deployment stage.
Also pingd constraint has been changed to be based on score.
If all the nodes failed to ping the default gw, the resource
ain't stopped and remains on the last node where it was.
In addition public_vip_ping task has been splitted out
to avoid race condition when ping_checker resource might
be started up on controllers before a primary one.
JIRA: FUEL-212
JIRA: FUEL-217
Change-Id: Id60ece479fce1ceabc47034f39997ddbaacd62d9
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Update documentation for Colorado 2.0
JIRA: FUEL-215
Change-Id: Ie922ff794e686e1824483a91a9571252adc2b1e2
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
(cherry picked from commit 5dce11ef60ff69ba5127088d6b6f5663fe46c48f)
|
|
Change-Id: I4c232fec4f35add7b04faf305cdf53dde70d7e92
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "Use odl v1 mechanism driver of L2 scenario" into stable/colorado
- Use odl v1 mechanism driver of L2 scenario
ODL Boron + v2 version of networking-odl does not currently support
assigning security groups to existing VM in L2 scenario. For details
please look at:
* https://bugs.opendaylight.org/show_bug.cgi?id=7021
* https://gerrit.opnfv.org/gerrit/#/c/23637/
JIRA: FUEL-216
Change-Id: Ic16bccf248ee4fbf0d97bfcd19f2831f36136521
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Disable public ping_checker resource by default
Avoid public vip failover in the middle of deployment
by disabling ping_checker resource by default.
JIRA: FUEL-212
Change-Id: Iaefec638f89e125137b62a1731dfa140177a8c4f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- [OVS] Update flavors key with large mem_page_size
Repoint to the "Update flavors mem_page_size"
from stable/9.0 branch of plugin.
Change-Id: I91d6a770faa9ee2d078b7f1ccccb7d61525ad923
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 4ecfe9e2b61a033c6616e101637a80fd4201ebdc)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "Compile DPDK to use basic cpu features" into stable/colorado
- Compile DPDK to use basic cpu features
Change-Id: I3ee9e5afa416af9e6a90b77f03ed9258c6bd4b1b
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
|
|
* Update upstream/vswitchperf from branch 'stable/colorado'
- docs: Update links for Colorado 2.0
References among VSPERF documents are realized by html links
to the final doc version stored inside the artifactory.
These links are release specific and have to be updated
for every new release or release version. This patch
prepares links for Colorado 2.0 release.
JIRA: VSPERF-415
Change-Id: Ibd17d55063069204a5556058e51660b542c8bee4
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Bill Michalowski <bmichalo@redhat.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Rework processorcount limits to os_workers
JIRA: FUEL-212
Change-Id: I1c5b8fe123406f1a96c5432d91a9ee5806c7cf62
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- [odl-l3] Get OVS plugin into the action
Update ovs version to 2.5+ in order to get inserted security group
connection tracking flows in ovsdb, which allows to pass
tempest scenario of test_network_basic_ops.
JIRA: FUEL-199
Change-Id: Id3e6c8ed2b79c4b6b4a7623f0d262c63f1d1d89f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 2c1f17baaf2ce9e892722c7f33586229a5586eed)
|
|
Armband does not yet have DEB/RPM repo snapshots, so revert
upstream Fuel@OPNFV change enabling them.
JIRA: ARMBAND-155
Change-Id: Ib08c36bf28a66ef38d8b33031dcbf363fb34123c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 7684dd13589cab6860e514a9c3b8043666c818da)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Point to specific snapshot of mos repositories
Fuel 9.1 was released, it is a first time when new version of Fuel is
distributed through the same repositories as previous one, point to
specific snaphost of mos ubuntu repo to prevent mixing packages.
Change-Id: I64bb52657ce476b0c1fdc8e858231ad751ba12b1
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit fe3fc91c23ace520f32830b6af5205c39088f922)
|
|
Since we are now building inside docker containers, it is no longer
necessary to use `python-debian` from pip repo instead of Ubuntu.
Also drop repeating the repo mirror build in case of failure.
NOTE: This cherry-pick DOES NOT remove Ubuntu mirror blacklists,
as it does on armband/master, since Fuel@OPNFV/stable/colorado
still uses the old mirror selection mechanism.
Change-Id: I62890b6ae7977cd8a39c06ce17c8964e6cb1dddb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
While at it, also upstream:
"build: Use OPNFV_GIT_SHA for ISO preparer ID"
JIRA: ARMBAND-98
JIRA: ARMBAND-146
Conflicts:
patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch
patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch
Change-Id: Ifcd7b3041d172aa492e26477c0872cd96efd90ba
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "deploy: templates: Fuel VM for Enea Armband lab" into stable/colorado
- deploy: templates: Fuel VM for Enea Armband lab
This is the initial VM description fit for spawning Fuel Master
VMs in Enea's Pharos lab (Armband lab) [1, 2].
[1] http://www.enea.com/pharos-lab
[2] https://wiki.opnfv.org/display/pharos/Enea-pharos-lab
Change-Id: Ia89f9728fff0ab1c279f6200fd558d9643cf4ea5
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit f3f4e1608b8d9b5dd7435b43d2512b9d981757f1)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "build: Use OPNFV_GIT_SHA for ISO preparer ID" into stable/colorado
- build: Use OPNFV_GIT_SHA for ISO preparer ID
isoinfo -i lists the following information for Fuel@OPNFV ISO:
"Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3"
where the SHA hash is Fuel git repo HEAD SHA.
For Armband's build system, using only the Fuel commit ID is not
enough to fully describe the state of the source code, as patches
are also applied to other fuel modules (as git submodules).
Instead, a pointer to a valid Armband commit ID should be used.
However, Armband overrides OPNFV_GIT_SHA to the Armband git repo
commit hash, so the ISO metadata should also reflect this.
While at it, allow product name to be overriden, to signal the
commit ID should be looked up inside the Armband repository.
Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 94ea115c36d5f5c79823692ac80626cf8959b35d)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- [ODL] Use OpenDaylight Boron
ODL Boron will be used in all scenarios except bgpvpn beacuse vpnservice
was removed in this release, we still will use Beryllium for this
scenario.
This change only replace Beryllium with Boron, it does not use any new
features like odl-netvirt-openstack.
Change-Id: I95264cc97f5b9e922ab3fb7dc024724d9fb83e9c
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit e1314e2e599cfff5625b8e4694832b731a663887)
|
|
JIRA: ARMBAND-143
Conflicts:
armband-fuel-config.mk
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Change-Id: I388e324b39aa2cec015bc65559f4c363bc37abdd
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "[odl] Get latest changes" into stable/colorado
- [odl] Get latest changes
* Fix setting bgpd password with puppet
* Enable G1 garbage collector
* Adding caching possiblity
* Add firewall resource that opens BGP ports
Change-Id: I8f779ba7356acf52967e594a1a213edf192962fc
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 1d4f96facadd5458a87a4d68b0b5298ca47cd1fd)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "Use tacker plugin in SFC scenario" into stable/colorado
- Use tacker plugin in SFC scenario
JIRA: FUEL-205
verify: no-cache
Change-Id: I37746bf3e490f6b707de8fe56af10f1df932908c
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit 40ddf04b3b28a6b5ffa5b74c1e3140c976ca1612)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- deploy: Fix: remove storage files explicitly
Previous change [1] tried to move the responsibility of removing
storage files (raw, iso) from our python scripts to libvirt.
Although this works as expected for non-root invocations, like
Armband deploys, it fails to remove raw files in Fuel@OPNFV deploys.
Work around this by keeping both mechanisms (libvirt managed +
python explicit handling).
Related-bug: ARMBAND-128
[1] https://gerrit.opnfv.org/gerrit/#/c/22447
Change-Id: Ib846cd6071705b71d98824385835d724c729fd78
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit aa912dc6691fba23c0827108f6a20296942e1ac0)
|
|
Change-Id: If6a3472a2f8fe64db2469536fe4d12d88e7a61f0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 15aac10c6b474790aedfd88d80c5e9d86a7f36b2)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Support different format of fuel task info
As described in this bug: https://bugs.launchpad.net/fuel/+bug/1625518
json output of the task can be in different format: single dict or list
of dicts. During tests of https://gerrit.opnfv.org/gerrit/21807 only the
later one was visible, try to support both types of output.
Change-Id: I7d3e12270c8246b03bdc6c73d3be77a039df469f
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit b2a63bfe5746729b4731a14d98c50fb7f59d875e)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- Merge "Change the way how we track deployment" into stable/colorado
- Change the way how we track deployment
Use fuel2 for start deployment. Since it does not return progress
use deployment task to provide this information. Currently used
'deploy-changes' will behave the same:
https://bugs.launchpad.net/fuel/+bug/1565026
Try to handle situation when nodes temporary go offline. With
deploy-changes environment still was in 'new' state in this situtation
which causes timeouts from jenkins.
JIRA: FUEL-196
Change-Id: I6548a5ec807551388e845044c282b7af32eb9100
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit b73526033c5c5b93ca96f411a1d90dc5c49b9228)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- build/docker: CI: no tag reuse on env var change
The previous change adding support for OPNFV build tag reuse
added the get/put-cache functionality to `build/docker` just
for detecting env var changes between tag creation and current build.
Obviously, when building outside CI, it is up to the end user to
force a docker rebuild when env vars change (this was the behavior
before the tag reuse support too).
An alternative approach would be removing get/put-cache completely,
if we consider the env vars (http proxy related) never change for
CI cached builds (seems to be true, worst case we wait 1 day for
the tag to expire when it happens).
This change just fixes the original intended behavior in tag reuse.
JIRA: FUEL-204
Change-Id: I14666994bc334012a5198a64a4a24cd4962e4bd6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 1c7eb680b34fdcd83b92c43a4c78db3c54bf567b)
|
|
* Update upstream/fuel from branch 'stable/colorado'
- build/docker: Reuse tagged image for OPNFV build
During CI build loops, the workspace is freshly fetched,
so '.docker' make target is built each time.
Reuse existing 'opnfv.org/ubuntu-builder:14.04' tag if present, but
enforce a configurable lifespan for this tag (currently 1 day), so
it does not get stale.
JIRA: FUEL-204
Change-Id: I8d1bd81f3e5e81068e9586c9bea9f43b3327eb38
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 638d832527012531b506ec0ba40b297c41bfda0e)
|
|
Change-Id: I6a6a80bf58ae453485431ecc35eab8cb553c29e0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 12656ace377504c90431d21cc7e3e9594e7ecf0d)
|
|
Change-Id: Idedf6905cf5cf715b3d428b63c2e1ac2b2469632
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4d2bd7a7bafd429610dea5cfdb477acdf9d30747)
|
|
Some eth drivers, such as those for APM X-Gene Mustang Board's NICs, do
not advertise operstate properly in sysfs, ie. it is advertised as
"unknown" whereas ethtool shows the NIC as fully functional with link
detected. This further affects "ip link show" output which is parsed
within _check_iface_ready() method.
Replace "ip link show" command with "ethtool" in order to obtain proper
results when operstate is unknown.
Launchpad bug: https://bugs.launchpad.net/fuel/+bug/1618480
Closes-bug: ARMBAND-140
Change-Id: If8e28d3720161d9ffe897b875af235561cf1062d
Signed-off-by: Stefan Sicleru <stefan.sicleru@enea.com>
(cherry picked from commit 42050fe09821b29b4879f77411eb558c57c302cc)
|