summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-26Updated armbandJonas Bjurel1-0/+0
Project: fuel d53f15a6dacb5e3d3fd58002692f9c08256ff1e9 Enable ci off-line deployment Updated dea_base to use locak repo mirrors for off-line deployment NOT TO BE PART OF COLORADO.1 Change-Id: Ia8e2d716570267ed9a9e06e253b6a7b258ee26eb Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit caee61817eb7f4235ca33a9da12f14a285f9e012)
2016-09-26Updated armbandJonas Bjurel1-0/+0
Project: fuel 0a76d88bcd02fcfe4678310e7d8a6ffdbabfd48e Properly handle quotes in argument masking Use shlex to parse the command line, thus handling quotes and other special characters. Change-Id: Icc3a2cd934aac8f67e07d967f76c7679bcb34996 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit bddbf2a740b46d1ad763967b8c8662b1877a4d75)
2016-09-26Updated armbandJonas Bjurel1-0/+0
Project: fuel d198db7f42da2915f506e7d679d47823eda58b2a Don't fork a templater process, use the library Change-Id: I931ba56fe65f2f5d5af483a8bfe654a0ecda1611 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit ff26503f13676b7551afc0633621786edd2811f0)
2016-09-26Updated armbandJonas Bjurel1-0/+0
Project: fuel c751ac064c2e9ae41caef6e529a3c39d733bfcf5 [OVS-DPDK] Turn off missing options Get all gcc/compile options to conform to corei7 arch. JIRA: FUEL-186 Change-Id: I5ce76631aac9174c69362f96f71e26285fc95842 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 861836e6bbd545d3dcee1bd041ff867fb4e3d357)
2016-09-26Updated armbandJonas Bjurel1-0/+0
Project: fuel 0a4bad20dcca5e0f8b9ab577b0ccdd3e38a3db86 Remove extra empty line Change-Id: I462a99b42d05b979c4f1904e7309e87ddd94d1bb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 2c7b9bb6623844eeea95373ec2752b0200cd69e8)
2016-09-26Updated armbandJonas Bjurel1-0/+0
Project: fuel 60ced1854eaa8c3c8f1211c4b43f2a20b3a58e9d [performance] Disable keystone token revoke Change-Id: I6db0bfaab5462a9a8f8de64bc1b088607d407bab Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 5bcac1cf6a0d9367ac31f0ca5c6064d30433377b)
2016-09-26Updated armbandJonas Bjurel1-0/+0
Project: fuel cb51d993eb0ef2be99fbc06138dfd37e3dfe15ba Fix: ISO build omits long path files make iso generates: libisofs: WARNING : File "/ubuntu/pool/main/libj/\ libjs-twitter-bootstrap-datepicker/libjs-twitter-bootstrap-\ datepicker_1.3.1+dfsg1-1~u14.04+mos1_all.deb" can't be added to Joliet tree, because its path length is larger than 240 At the end this package is missing in latest ISO. NOTE: This issue is only triggered on certain kernels during build. Closes-bug: FUEL-190 Change-Id: I21f7f1cbe3f64317d2feb66e371611a654cf30f8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1e380388ee91ae71a7a32122d3942e53f146ccad)
2016-09-23Updated armbandMichal Skalski1-0/+0
Project: fuel fcbbd6c796fca5471f29f771e9ea6949c263d795 [KVM] Install plugin in post-deployment JIRA: FUEL-171 Change-Id: Iead815ba2da76493f108ad71bc32cff265302b55 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 53e6d97c9157f1e908d99dcca1207de23ea73132)
2016-09-21Emergency patch - fixed broken linkscolorado.1.0Jonas Bjurel2-8/+8
Change-Id: I4ec0cf95d714cbc476f73fbc4b90fd039dbd973e Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f11e43f69af038f99ded659071e9152dbbddaf13)
2016-09-21Updated armbandJonas Bjurel1-0/+0
Project: fuel cc10e9261f6da77f10ac87e1ff4b86c9e0e44b35 Emergency patch - fixed broken links Change-Id: I7aea7c06775cac3efeb22d2256c7acf6fbb137d5 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 61d9f66916fe7cacc1df25438b4060b9f3c9402d)
2016-09-20Updated armbandcolorado.1.rc2Jonas Bjurel1-0/+0
Project: fuel d1dd9f9d570e4fa9cc3be53f9072f12efeb474cd Temporary Hardcoded Ubuntu repo Meanwhile we're investigating the issues with Ubuntu repo mirror selection, we will hardcode the Ubuntu repo mirror Change-Id: I776bd3a8a72dc87e00052e8ff965de1134293c7a Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 3e506f9248f2a64a8a30c832049df392b01fcb4e)
2016-09-20Merge "Rebase: updated blacklist for Ubuntu mirrors" into stable/coloradoAlexandru Avadanii1-2/+2
2016-09-20Updated armbandJonas Bjurel1-0/+0
Project: fuel aae10837b3763e9d0a806dda9964abaebb6d8736 Make sure to use only up-to-date mirrors Whitewash the geographically "close" mirrors against the list of fully synced mirrors - we've had a few instances of getting bad mirrors which would break the script. All credit goes to: https://askubuntu.com/questions/39922/how-do-you-select-the-fastest-mirror-from-the-command-line ... and we should perhaps use the netselect tool as well somewhere down the line, but this fixes the most urgent problem. Change-Id: Ia61a2bd78657b28019f57fc1962d410e754e6d2a Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit e12aec84ef1767d4ba9469dfb12d65d928bf0ed4)
2016-09-20Updated armbandJonas Bjurel1-0/+0
Project: fuel 4d3783e1afadf7c23a6a96624170906c4cf90f0d Repo tidy-up + licence scrubing - Added licences and (c) to files not complying to Licence and (c) policies. - Removed example templates not having correct licence claims and no longer being rellevant. - Removed the Vagrant deployment method as it is not used, not rebased/up to date and not holding correct license claims. Strategies used: - Machine generated are not assigned an licence text, the licence follow from the source. - Generated patch files are not assigned an licence text, the licence follow from the source. Change-Id: I9763f076eae51fbb2d4e5cb8cacfa4bb6cf338cc Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 65b7cfcd862a75be72fb98777190c49f8b6ea0d3)
2016-09-19Rebase: updated blacklist for Ubuntu mirrorsAlexandru Avadanii1-2/+2
Change-Id: I404791b14603b4ebdd0be1010412ec77cf75a478 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit cfd8c76d1f84874504ca019398787db76cf3c007)
2016-09-19Upstream: move patches to repo-patches dirAlexandru Avadanii5-29/+16
Upstream change: [1] Slight rebase of our patches is now needed. [1] https://gerrit.opnfv.org/gerrit/#/c/20043/ Change-Id: I955ae3c5c304d8c8da6e42680c81e9255487fb68 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 957a16139281785c2a6685428f7b037d6578f08d)
2016-09-19Updated armbandAlexandru Avadanii1-0/+0
Project: fuel f9326c161e2e8ed039499d30cced7c2553874e26 build: Move patches to <patch-repos> dir Decouple main Makefile and repository patches by moving all Fuel component patches to a subdir, <patch-repo>. Proposed structure of <patch-repos> dir: - patch-repos/*.patch are intended for <fuel-main> git repo; - patch-repos/build/repo/<fuel-module>/*.patch are intended for <fuel-module>, e.g. "fuel-nailgun"; Full list of Fuel submodules supported by this mechanism at [1]. While at it, replace all occurences of </tmp/fuel-main> with <FUEL_MAIN_DIR> in main Makefile and rewrite a few git/make calls to use the "-C" arg. NOTE: `git -C` is available starting with git 1.8.5. [1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk #L32-L44 Change-Id: I5e4adc7285054777c3898592ed48482ccd2b706f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 52701ce099ac455aa393aac34d684f5d59b3d2fe)
2016-09-17Updated armbandcolorado.1.rc1Michal Skalski1-0/+0
Project: fuel 269773ffd3bbd267aeee21b49f83783c064c04c6 Increase number of hugepages allocated for nova Yardstick is using m1.small flavor for some tests, in case of ovs scenario it should be possible to allocate 2GB from hugepages. Change-Id: Ie908d94e63a5055907bb33c69a5e028739f44f2e Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit c64a4063f591c0140509e3edb88d9f0c3cd20928)
2016-09-17Merge "fuel-library: nova: AArch64: enable hugepage supp" into stable/coloradoAlexandru Avadanii2-1/+94
2016-09-17Updated armbandMichal Skalski1-0/+0
Project: fuel 983af0184b9c0fbf6deecb2a851f4f89cc362c25 Stop using network transformation Due the bug in code we did not apply network transformation to created environments, but still Fuel base on chosen segmentation type and networks to NICs assigment has been generated network schema itself. Since we don't use custom network schema we can remove transformation defintions from dea pod overrides files. However there is a need to configure NIC properties in case of dpdk deployment. JIRA: FUEL-192 Change-Id: Ib7dab4d61910ac8c44b6d91e0c486c9693034823 Signed-off-by: Michal Skalski <mskalski@mirantis.com> Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-17fuel-library: nova: AArch64: enable hugepage suppAlexandru Avadanii2-1/+94
This patch adds AArch64 to the hardcoded lists of valid architectures for hugepage support. Closes-bug: ARMBAND-90 Change-Id: I3765e6bc314393a58db70590f3890fde206e3feb Signed-off-by: Veena Lingadahalli <vlingadahalli@mvista.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 2f4a34b88d18f7653934eaec25e99dba3bac5de6)
2016-09-16Updated armbandJonas Bjurel1-0/+0
Project: fuel 1cead5571d504f5e0525eac22e9b4831867d7c18 Final updates of release notes -Added filters for fixes, issues and work-arounds Change-Id: Id76545fd7837c83145bd8d87b309c23849da6f7e Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 7dc64e4f8813a1cef9697074326698bc27a85937)
2016-09-16Update plugins in documentationcristinapauna1-0/+0
Change-Id: I0059e397d2f6e213e549092601b61a200f5b96a4 Signed-off-by: cristinapauna <cristina.pauna@enea.com> (cherry picked from commit b886347f4a773f4d9b742920cc3a76751254f8fe)
2016-09-16Update documentation with AArch64 specificscristinapauna9-102/+186
The documentationfrom Fuel was introduced to armband project by https://gerrit.opnfv.org/gerrit/#/c/20679/ This patch updates it with aarch64 specifics Change-Id: I05eccef015fd399e7d05a0505e85e733a8e95f1d Signed-off-by: cristinapauna <cristina.pauna@enea.com> (cherry picked from commit 5bd99052ed055c76efbc479f00edb09b5780cb56)
2016-09-16docs: Copy OPNFV docs dir as documentation basecristinapauna50-881/+474
There has been some restructuring of the documentation in fuel project. This commit copies those files, while a subsequent commit will adapt the documentation with aarch64 specifics. Change-Id: I56b52d5d16975b88fd5b26099b43046c6a5d5747 Signed-off-by: cristinapauna <cristina.pauna@enea.com> (cherry picked from commit b832a3e82070e12dff555e2a83d604de7e398acb)
2016-09-15fuel-plugin-ovs: Simplify debian version stringsAlexandru Avadanii4-103/+118
Remove all suffixes from OVS debian packages, and simplify the plugin code handling the fetching of said packages. While at it, enable: - local mirror caches, by mounting /etc/hosts in the docker builder - HACK: mismatch between debian source versions and debian binaries Related-bug: ARMBAND-89 Change-Id: Ifbf0e11c90cf7b2f76ce72af8ca3469a33bee071 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6be5639d8ce2f6e282db6f3d19699a341b9b491c)
2016-09-15Updated armbandbillyom1-0/+0
Project: fuel b90311bf3240c0f57ee747e6cf3e57e07a6cf5fa Uplift fuel-plugin-ovs Pull in "Update flavors mem_page_size" Change-Id: I3e285cefee561dbbc02eb9ab7d2e9c01eef2742a Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-15Updated armbandMichal Skalski1-0/+0
Project: fuel f8337987d6feab6674ce05508c321ac30ef996a3 Use Boron RC3.5 for sfc scenarion It should fix problems with vm communication through floating IPs. Change-Id: Icadc71f2b99c28715c15389e59111272a21440fb Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit ff9c24257a2c62dd981297a92eecf712f6643617)
2016-09-14AArch64: fuel-plugin-ovs enableAlexandru Avadanii9-1/+1069
OVS-DPDK-NSH is not supported on arm64 for now, see [1] Closes: ARMBAND-46 [1] https://jira.opnfv.org/browse/ARMBAND-86 Change-Id: I79b33bab7348e297c06ff4bb2bf7cc23f21eb7e3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 5b49b2f7ea1485b56ebc7815b5a3803363ec29af)
2016-09-14Updated armbandMichal Skalski1-0/+0
Project: fuel 098c34d407f71df6f29cd70b0c8381c9522c71b2 Update local mirrors defintions If we only use main section, not all required packages are discovered. Change-Id: I2eaa4a7bfc659b820901ce55a4ab799c3281df3b Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 2e9ff14f8ab6ee9e4ebf84a2e8e40bd3f149c48e)
2016-09-13Revert "patches, docs: Remove MySQL WSREP SST provider"Alexandru Avadanii4-0/+126
This reverts commit 8a696682b3fd0cb5f32ddaca8ede5db7b001a57f. Change-Id: Ib1698643639436243768f4a8209c4d68314a97ca (cherry picked from commit f5e0922b9282dccb5d79c80c58801f455495c4ce)
2016-09-13Updated armbandJonas Bjurel1-0/+0
Project: fuel acdc36531e0b6ae2449ea7dfef58addb8786acb1 Add intel-sc lab devel-pipeline configuration intel-sc is the lab devel-pipeline configuration for a lab of Intel in Santa Clara, CA, USA. This lab is behind Intel proxy sever. Change-Id: I401b030adf82d6a19397e92aef4b30ebe971d80c Signed-off-by: davidjchou <david.j.chou@intel.com> (cherry picked from commit 8079d1237ab9f2326adef163dc509c8a84e62775)
2016-09-13Updated armbandwu.zhihui1-0/+0
Project: fuel 72248b41f0f26b0daaacb5a61623f2f7f0f4a9b5 update node_reset() in zte_adapter.py Change-Id: I71790b8abb25936045f777a78ed903f3b8ce4303 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn> (cherry picked from commit 161dd445f06aa9a5dfcd273d89a00d1f02260ba3)
2016-09-12Updated armbandMichal Skalski1-0/+0
Project: fuel 5bd3673cb88408f13b7d84d4c09462cb15816476 Reduce ceilometer memory usage JIRA: FUEL-189 Change-Id: I54854e4cc87f0c0e9e348e18131aa88b70e30054 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 4c47ef4b6f192482d99196c7a7070e5f396b1fd5)
2016-09-12Updated armbandMichal Skalski1-0/+0
Project: fuel 35cea158cb9fe9c8780bc9d90871b2ed64e4ccbe Change the way of hugepage allocation Try to allocate enough hugepages for all NUMA nodes. JIRA: FUEL-186 Change-Id: Idcdf6ab616dfbd9ef1104be8d1667421221ea5f2 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 8d7559b50b265298f7800b18f840b87ad1e84b20)
2016-09-11fuel-library: mysql: Fix spurious install timeoutsAlexandru Avadanii2-0/+150
Backport the following fuel-library fixes from Fuel 9.1: - wrong relationship in clusters mysql manifest - Rsyslog doesn't have write permission to /var/log/mysql/ directory These two bugs manifested as: - random deploy issues waiting for MySQL to sync, without the server being installed; - no MySQL logs were saved due to permission issues; Closes-bug: ARMBAND-78 Change-Id: I317e45d013229145e2ccbd8bb4f76ae03d544098 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b5331973a5c755d1612d37d82841db5a98288489)
2016-09-09FIXME: deploy: EFI: Skip re-ordering boot via IPMIAlexandru Avadanii1-0/+31
On EFI systems deploys, altering the boot order via IPMI causes issues on some specific targets. Until we agree on an uniform solution for EFI systems + IPMI boot order handling, just skip altering it via IPMI. Related-bug: ARMBAND-71 Change-Id: I7790e1e8e3540d5ab10b8d7165316a04cf58faa4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 946e599b00d0e9ebccb12eb0071eb25343ca3fac)
2016-09-08deploy: x2 timeout for fuel master installAlexandru Avadanii1-4/+10
Change-Id: I1281b0b6b9d631e371484795a53113032ebbc83c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7561f5f237a6abf84f7fd8adff94069906aded95)
2016-09-07Updated armbandGuo Ruijing1-0/+0
Project: fuel e07d06641a1bd5edc43eacc70bac75f824ea99ad Disable cpu features in ovs with DPDK Change-Id: I2cf5df2f0469f21f64e0e7d11740058639f68697 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com> (cherry picked from commit 9a3f6a38d708cbc3633d203e36e32bc91764ba20)
2016-09-07Updated armbandMaryam Tahhan1-0/+0
Project: vswitchperf c4ba1cd1c33938ab54b217599d7ed9d9259a6caa docs: Fix links and formatting Documentation was updated as follows: * links were updated to refer to documentation specific for Colorado release * section decorators were fixed in LTD * links to testcase and deployment descriptions were fixed * duplicate labels removed from LTP&LTD * fixed typos in formatting and text * links to scalability and stress tests fixed after their renaming JIRA: VSPERF-349 Change-Id: I8b1d7a0220d637a684e70a788dd88250c646124e 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>
2016-09-06build: ubuntu mirror: blacklist another SE mirrorAlexandru Avadanii1-3/+6
SE mirrors are acting up lately, blacklist them: - ftp.availo.se - ftp.lysator.liu.se Change-Id: If4cc7c207fa7ce39821cc8a8f754a48f573ff374 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 812b9c2aee17342b5ba00f53b45cbc721fc4adef)
2016-09-06Merge "deploy: Attempt fixing random deploy timeouts" into stable/coloradoAlexandru Avadanii1-4/+5
2016-09-06Revert "EFI: Move patches to Fuel@OPNFV, upstream prep"Alexandru Avadanii4-198/+157
This reverts commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7. Change-Id: I317e0f6aa7665c28035307149e6e7d42fdf508f3 (cherry picked from commit 441caa623edf47dcf8944ed11aa3c193897dcf72)
2016-09-06Merge "Revert "submodule: Kill fuel-astute"" into stable/coloradoAlexandru Avadanii4-1/+9
2016-09-06Revert "submodule: Kill fuel-astute"Alexandru Avadanii4-1/+9
This reverts commit 41fc21bb87ee0ab245e8f6ada2ce49a45d633ede. Change-Id: I0f60787acc445555b255a92671ccf0ffe8610f78
2016-09-06Updated armbandferenc Cserepkei1-0/+0
Project: fuel 1dfcb4b452230c0d66892f3a373c299d2c46021b Script updates for CI job Due to the redesign of the SFC feature test, the poc script became part of CI job functest-fuel-baremetal, scenario os_odl_l2-sfc-ha, there is a need of full uplift to colorado. Changes: - GPG keyserver use (line 61) - patch updated fixing the debian package dependency issue (python-oslo.messaging-) - some typos are fixed - OpenDayLight address is read from hiera (management vip) Change-Id: I4a19ec753a575220cf321819ab4ff2d9433ec16c Signed-off-by: ferenc Cserepkei <ferenc.cserepkei@ericsson.com> (cherry picked from commit ad0dd57dc045b58c46e53f281ab57e70d00947d7)
2016-09-06Updated armbandJonas Bjurel1-0/+0
Project: fuel b10ada83fcf236e1d3f0e181b3b551e45c39a0c4 Final Colorado document review. - Please review the rendered HTML document (See Jenkins references below) - Please verify the documented procedures and instructions READY TO MERGE Change-Id: Idff52212ca68ce2b97f203043e18a18c582589a7 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-05Rebase: fuel-mirror upstream changesAlexandru Avadanii1-3/+1
Slight rebase after upstream change [1]. FIXME: While looking at [1], I noticed that Armband is not using the proper fuel-mirror version due to our divergent patch & build system. This should be fixed later. [1] https://gerrit.opnfv.org/gerrit/#/c/20317/ Change-Id: I55798ba1004312cd737b6613744683437e98865a (cherry picked from commit b4d5044e751801507738dc02d116436d909d2248) Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-09-05submodule: Kill fuel-astuteAlexandru Avadanii4-9/+1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 376c76d05862ed38edeb217cd9480807571491a7) Change-Id: I376c76d05862ed38edeb217cd9480807571491a7
2016-09-05EFI: Move patches to Fuel@OPNFV, upstream prepAlexandru Avadanii4-157/+198
Now we can kill fuel-astute submodule. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7) Change-Id: Ie049062bb7a41adfbb056894c0a6f411a2d8c254