summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-04-29Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 2a44140041f62d054dd787e274a75421699d8374 - Merge "Added missing line in optical DG properties file" - Added missing line in optical DG properties file to support TAPI deletion flow Change-Id: I721cf0889c0a31b1ea5f7c8520ba9111e746406e Issue-ID: SDNC-1182 Signed-off-by: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
2020-04-29Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to b4f4ce86d78422081d28e2e1af2bd32938b639ec - Merge "fix download feature for package" - fix download feature for package Issue-ID: CCSDK-2126 Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com> Change-Id: I000e54c7fb0df68debbce38de8f66ae0ff974329
2020-04-29Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 13dab95122db58e7f997291ab198fd9c1bc5afba - Merge "Added toggole button to Actions/Functions menu" - Added toggole button to Actions/Functions menu Issue-ID: CCSDK-2248 Change-Id: I160be5614d5dcdc6331c342063efe0393c1365ba Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
2020-04-29Update git submodulesPiotr Borelowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 589118aacdc22bb5c2a975d857c4f2e62340bf8b - Rename to SOL002 Change the name of the project from mso-ve-vnfm-adapter to etsi-sol002-adapter Issue-ID: SO-2839 Signed-off-by: Piotr Borelowski <p.borelowski@partner.samsung.com> Change-Id: Iba63d558fede145f2ff0086a75b3dadcd1296d00
2020-04-29Update git submodulesSithara Nambiar1-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to 375d7bd29cdc687e11ae27183a20653e76bfba3c - NST selection changes- filenotfounderror Issue-ID: OPTFRA-675 Signed-off-by: Sithara Nambiar <sitharav.aredath@huawei.com> Change-Id: I2b5eb3017fc3a08921eb3e47013a65b90724806c
2020-04-29Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to ed4bc91ade3036af0d113c211e3136e5dbc42df4 - Merge "[CDS] Remove unused filebeat container." - [CDS] Remove unused filebeat container. The container definition is commented out. As logging is set to false by default, remove this comments. Will readd template when CDS team will be ready. Issue-ID: OOM-2370 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I939fc54504d5dac24a5016f7537b21beb6b18020
2020-04-29Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 178558281e539a675e1f38b4cb1ea20207da7ba6 - Merge "Changed http to https for SDK" - Changed http to https for SDK Issue-ID: PORTAL-890 Signed-off-by: Lorraine Welch <lb2391@att.com> Change-Id: I29db7da917f46a4bd3917fe1b71d714a9bf80022
2020-04-29Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 975dccc51b43b5a4019c45f448e63a110e3bd603 - Fix VNF entityId in policies Fix the VNF entity IDs value in json schema for each policies (in UI) Issue-ID: CLAMP-843 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I9515b01422acdfc0ec36f10cc70994145e561d7f
2020-04-29Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to db40a1cd76e5e306f97cf8fc111b4b3bd530d289 - Dual license config file Updated config aaa config file to dual license (EPL and APL) Change-Id: I95005e702aa07a927305e57a8a87f5d3abae95e8 Issue-ID: SDNC-1176 Signed-off-by: Dan Timoney <dtimoney@att.com>
2020-04-29Update git submoduleszhaoliping1231-0/+0
* Update docs/submodules/integration.git from branch 'master' to d00f623fcfd9d1cf0cf7178122095f552b13096c - update the integration doc for vCPE Issue-ID: VFC-1668 Change-Id: I5fc41873f7a31e4c67669ea8bb07b674bc434cec Signed-off-by: zhaoliping123 <zhaoliping@chinamobile.com>
2020-04-29Update git submoduleszhaoliping1231-0/+0
* Update docs/submodules/integration.git from branch 'master' to 9386b0b6fc7fea830c6e479a8505bde83fc8c881 - update docs_vCPE_tosca_local.rst Issue-ID: INT-1285 Change-Id: I6a365b56207ae3d21e8a6601f1110914d841160c Signed-off-by: zhaoliping123 <zhaoliping@chinamobile.com>
2020-04-29Update git submodulesTomáš Levora1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 2b0fb491053859a114064c4b4847916d909a5bec - Merge "Adding support for Ubuntu in create_repo and docker_entrypoint scripts" - Adding support for Ubuntu in create_repo and docker_entrypoint scripts Extend script for creating repository with adding Ubuntu platform support. Issue-ID: OOM-1671 Change-Id: I6b1c63cda18e53277fc2aad6dfa3eceefc9a0023 Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com>
2020-04-29Update git submodulesChuyi Guo1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 8189d6613964ac90995dfac73d33c05af695bd87 - Merge "Release new image version" - Release new image version Change-Id: Idf3d95103507add6cd1011367ecb89290caf4690 Issue-ID: USECASEUI-306 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-29Update git submodulesLorraine Welch1-0/+0
* Update docs/submodules/portal.git from branch 'master' to 3bd3ecd644964416972ecc3e6e6eb7e5e1fb132d - Merge "Junit for Duplicate Record Exception" - Junit for Duplicate Record Exception Issue-ID: PORTAL-814 Change-Id: If1391cb5db8f110db826ffd79b93b7fd46f8b0c5 Signed-off-by: ezhil <ezhrajam@in.ibm.com>
2020-04-29Update git submodulesezhil1-0/+0
* Update docs/submodules/portal.git from branch 'master' to d97095ffd8dc352a4eb13ec32472453afbea3f32 - Removed code smell Issue-ID: PORTAL-865 Change-Id: I024f091a30ef174458795ab4fb7843f58607ade1 Signed-off-by: ezhil <ezhrajam@in.ibm.com>
2020-04-29Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 684fb2fe4acda6cdb8ef9d9ace9ad1d58c677a15 - Merge "Set sdc onboarding volume mount permissions" - Set sdc onboarding volume mount permissions Set the permissions of files in the sdc onboarding backend persistent volume for package certs to enable access by the process in the pod which now runs as non-root user (since SDC-2798) Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2981 Change-Id: I6113f14ca9933e2fec2b565768ed5afbe3c18f21
2020-04-29Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f5e74e506c8ae56f4a7af7dfa516c5733fadb22e - [COMMON] Allow to use ' in mysql passwords derivePassword which we use to generate our passwords includes ' in set of special characters that can be used in passwords. Current implementation of bitnami configure-mysql.sh simply concatenates password surrounded with '' rest of SQL query. This causes issues if password contains ' as it creates invalid SQL statement. To fix this issue we just patch the script and escape the special ' character in password. Issue-ID: OOM-2246 Reported-by: Mateusz Pilat <m.pilat@partner.samsung.com> Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I3d2150760755e55558e2045cbb7ca5693c8ab71f Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2020-04-29Update git submodulesPaweł Baniewski1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to b101f008077c8036dcd9ca5e67ba6ff12bf3b394 - Merge "Fix How to use functionality page." - Fix How to use functionality page. Issue-ID: AAF-1091 Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com> Change-Id: I328bf5d6d31dcd5745d5b80b64dc28c5b62f54e2
2020-04-29Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to dae58c75b1e21aa437accdc4f748ea6e09e45907 - feat: Topology display location optimization of NS create model Change-Id: Icc8388560726b6a5620f9017633cbdb1a56269eb Issue-ID: USECASEUI-305 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-29Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to c6dfa07021b6d34063aaa554e53ad40bb68a8793 - fix: Fix the bug the create model msg info of services-list Change-Id: I4f6e57b5a731524258c511316773b0a63c60f6d9 Issue-ID: USECASEUI-370 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-29Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to 56e51a15559d879ae42de5e216dca2929981139c - Merge "Fix CertService configuration documentation" - Fix CertService configuration documentation Issue-ID: AAF-1091 Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com> Change-Id: Ia21a5aaa68a216343394c2bd4021f349f923b665
2020-04-29Update git submodulesShankaranarayanan Puzhavakath Narayanan1-0/+0
* Update docs/submodules/optf/has.git from branch 'master' to ca1d19b785a9ffca4946a8a10cf96fd674f3d400 - Merge "Add nsi info to the candidates" - Add nsi info to the candidates Issue-ID: OPTFRA-746 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: Icdb669e92cd55bfd40aeac61d0aa2ecf1a65de84
2020-04-28Update git submoduleskrishnaa961-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to e87411e6df60a0ead2f90c6975b5cea8ba1db20d - Add nsi info in the nsi selection response Issue-ID: OPTFRA-746 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I799c9575b781d858b47e6695050f7f79308fdd43
2020-04-28Update git submoduleskrishnaa961-0/+0
* Update docs/submodules/optf/has.git from branch 'master' to da6653e0886ea6e20b24324cb608adaf542c5b10 - Modify threshold policy to support multiple constraints Issue-ID: OPTFRA-730 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I8f8b4a694048088fcb61b6dbe7428b73f52e65d2
2020-04-28Update git submodulesVijay Venkatesh Kumar1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to b9245647657dfcde55315667c911130155b9dc1e - Merge "Update PMSH Frankfurt docs" - Update PMSH Frankfurt docs *Add example monitoring policy Issue-ID: DCAEGEN2-1820 Signed-off-by: dfarrelly <david.farrelly@est.tech> Change-Id: Ibfdfbc2877078815a97971c471b20c1e5cb316a4
2020-04-28Update git submodulesAgarwal, Ruchira (ra1926)1-0/+0
* Update docs/submodules/ccsdk/distribution.git from branch 'master' to 482c20d00c07d6f43e80d12edd532f8296d083bc - integrate spring sli container with AAF update mail pom with sliboot module Issue-ID: CCSDK-2304 Signed-off-by: Agarwal, Ruchira (ra1926) <ra1926@att.com> Change-Id: I2c125d57cf595e735d46c62d0cb99b6c751f3f1e
2020-04-28Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/features.git from branch 'master' to 4e9e71fca284a4c2f6d49c335af2fd6545152122 - Fixed sdnr sli dependencies Updated sdnr pom files to use sli version defined in parent pom instead of overriding with version 0.7.1 Change-Id: Ifbfac82c798de8493fddf746de44183e6b323d6f Issue-ID: CCSDK-2334 Signed-off-by: Dan Timoney <dtimoney@att.com>
2020-04-28Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to ac42fe6ee5e461c3053d40f23cc62882b6a59fe5 - Merge "AAI id mapping in SOL002 Adapter" - AAI id mapping in SOL002 Adapter SOL002 (Ve-Vnfm) Adapter project - mapping between vnfInstanceId and AAI Id to the DMaaP message Issue-ID: SO-2574 Signed-off-by: Piotr Borelowski <p.borelowski@partner.samsung.com> Change-Id: Ic20ff45a49b26c141aa834d55589f482f961e70b
2020-04-28Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 01d814c45616bcde613db3ca760df5c9348337a5 - Merge "Adding Generic VNF information in ControllerExeuctionBB flow" - Adding Generic VNF information in ControllerExeuctionBB flow Solving BlueprintName and BlueprintVersion issue Changing vf-module to vfmodule Updating AAI with Orchestration status Issue-ID: SO-2806 Signed-off-by: sunilb <sb00577584@techmahindra.com> Change-Id: I91aa653b946bae3940000f724710de87af3ce7df
2020-04-28Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to c51b795d86381f438619b95a4eb3df8122e2fa73 - Merge "Fixed error handling in the completion handler" - Fixed error handling in the completion handler Fixed error handling in the completion handler subflows. Issue-ID: SO-2829 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Id8c7332de6d7b0e382b56e86afa83ff231d8cda3
2020-04-28Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 17632353502e1750d96b21dc6b201994b626d481 - Merge "refactor camunda client in apih" - refactor camunda client in apih Switched CamundaClient to use restTemplate Combined clients into one CamundaClient Initial setup of exception handling in camundaclient Initial fix of compilation issues Switched CamundaClient constructor Updated how url is set in CamundaClient Updated auth to fix tag mismatch warning Added throwing ClientConnectionException to client Updated ServiceInstancesTest cases Updated error handling for CamundaClient Updated how response is returned Fixed failing unit tests in apih infra Refactored response handler for responseentity Fixed failing unit tests in apih Removed old unit tests for client Import cleanup for unneeded changes Updated to use new CamundaClient Updated CamundaClient and ResponseHandler tests Removed unused RequestHandler Issue-ID: SO-2834 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I82ff489c9c939a7e8ec0e48476daf7e45baa5f20
2020-04-28Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 746962d1b9e1aa7399436151fbb35c4efb0347f2 - Merge "Update encoding library used" - Update encoding library used Update encoding library used Issue-ID: SO-2830 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ifc5099f10c15fc6ef8bac367211320d61c20ca43
2020-04-28Update git submodulesPANCHAL1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to 0424f6f58b83ced065a0f49fdafa3e50bff18f1e - Add updated DCAE MOD documentation Issue-ID: DCAEGEN2-1865 Signed-off-by: PANCHAL <dp023n@att.com> Change-Id: Iaec5bd3fedc4329ffc21f32c4ea3f65bf41ffb06 Signed-off-by: PANCHAL <dp023n@att.com>
2020-04-28Update git submodulesLukasz Rajewski1-0/+0
* Update docs/submodules/integration.git from branch 'master' to b98b27daa949aa82207973e67f5d7dd0c8a361f5 - Documentation for vFW In-Place Upgrade with TD The documentation for vFW Traffic Distributino use case evolves to vFW InPlace Upgrade with TD one. There is changed description of the use case purpose, the workflow, the configuration procedure and information about the way of testing. Change-Id: I1e68d46871864b4e65df553355b3a11d86b4c9cb Issue-ID: INT-1277 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
2020-04-28Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to bb26876947f2843a37a3acdac961762497e8fd35 - Merge "change the entry file name to be equal of package name" - change the entry file name to be equal of package name Issue-ID: CCSDK-2338 Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com> Change-Id: I2b34cbcf146d8435f19399bac66c50a6ce74a7ac
2020-04-28Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to cd8808fd57c63f044dce71cc8eabdcb2a418f601 - Merge "Remove all vLB.CDS from package name" - Remove all vLB.CDS from package name Issue-ID: CCSDK-2342 Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com> Change-Id: I4b61f8a20fab9b31e9f0ca4b12b2949d97f4bfd3
2020-04-28Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 133f584b2257aa8c85a95854ca6b324a3f34edf3 - Merge "Making POD run as non-root" - Making POD run as non-root Non-root user addition Change-Id: Id110aebea3d3526aaf319d8994670644a7bab698 Issue-ID: CCSDK-2149 Signed-off-by: jananib <janani.b@huawei.com>
2020-04-28Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 08cb42224a5d20783e525cadbab1b7ae40a86f72 - Handle null case in `GroupVersionUpdater` - change in the final condition of `isGenerateGroupUUID` - Added tests related to modified code Issue-ID: SDC-2913 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I22738f9f4922467209a16a4d6b3b78d7bfac11c9
2020-04-28Update git submodulesLukasz Muszkieta1-0/+0
* Update docs/submodules/so.git from branch 'master' to aefb6fd6b91be3aa44b5e8183fa1c9e471853c29 - Merge "add junit coverage" - add junit coverage Issue-ID: SO-1576 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> Change-Id: I993537873f19329753a958faf708119b5aafa9b7
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 33a4512b6eb6204e2209a788b06153a889629f4e - Refactor CsarUtils::getEntryData Change-Id: I1732ae05cfbe93c1bef8c249e16088a0cad34106 Issue-ID: SDC-2812 Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 76593bfbb1a233d76367abe903734c13b75f3a35 - Refactor CsarUtils::populateZip Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I136ebda0ff92d6c42368f102ccf2b10f37524808 Issue-ID: SDC-2812
2020-04-28Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 83df155640dd015d68f01f784dfab24d4c252af1 - Remove csvReportFilePath from ValidationConfigManager This commit aims to extract the csvReportFilePath field from ValidationConfigManager in order to improve testability. This commit contains multiple minor modifications resulting from bubbling up the csvReportFilePath static field to where it is actually set. Put differently, most of the modifications result from changing the signature of the functions which formerly relied on ValidationConfigManager.getCSVReportFilePath. Change-Id: I82c3b0fca8a0f407319e40ecfff45e89ec1d4323 Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2499
2020-04-28Update git submodulesChuyi Guo1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 71508d68626d2a38abc3ad9c896061feab719a42 - Merge "fix: Fix the bug that the model msg is error when deleting the vnf package" - fix: Fix the bug that the model msg is error when deleting the vnf package Change-Id: I95baaba0184434c0609a9efe1cf0161377726eeb Issue-ID: USECASEUI-305 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to b237c345a2bca5cd8630bf18cf8dde1ada5c8a41 - Update release note Issue-ID: AAF-1132 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com> Change-Id: Ic8d37e5033e17412f14fd373ea5d260f0d3730f3
2020-04-28Update git submodulesOfir Sonsino1-0/+0
* Update docs/submodules/sdc/sdc-distribution-client.git from branch 'master' to c7bd0548fd6f1dff6170f2767d9428264e19bc92 - Releasing 1.4.1 Change-Id: Idbe8853c72b799ada2dc25cbab442ed46548aaac Issue-ID: SDC-2721 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-04-28Update git submodulesroot1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 6714c077a8b9380776def2fd9e39bd4d694678fc - Changes for MDONS usecase Change-Id: I0845854224ec78ed21e64ccfd7f2c1b710221b7c Issue-ID: USECASEUI-371 Signed-off-by: root <preethamshyam.sathiyaseelan@us.fujitsu.com>
2020-04-28Update git submodulesxu ran1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 1aed3b28640e3616164b241cb5b5220e5a7d3b35 - Merge "Changes for MDONS usecase" - Changes for MDONS usecase Change-Id: I9c795fa2041c195ca29300398fb89b1cc3606ae7 Issue-ID: USECASEUI-371 Signed-off-by: root <preethamshyam.sathiyaseelan@us.fujitsu.com>
2020-04-28Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to e978667f57e600c89e7ee421366dc37ef2685121 - fix: Fix bugs image for services-list Change-Id: Ic7b3240781509a892a01cd3dbc8ba53cae96bba0 Issue-ID: USECASEUI-305 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-04-28Update git submodulesAlexey Sandler1-0/+0
* Update docs/submodules/vid.git from branch 'master' to b4af2036941854aa45aa9d53e06bd92de5a842d3 - Can't delete the second vfModule in drawing board - fix. Given two vfModules created under the same vnf, when try to delete the second vfModule its status not updated to deleted. Issue-ID: VID-819 Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com> Change-Id: Ie0c349d78940161d66a125782d917d28988e3c9d Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
2020-04-28Update git submodulesJohn J. Franey1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to f85e8b191aedc1e5a751a54184427fb0a65c8a0a - release 2.1.21 Issue-ID: AAF-1136 Signed-off-by: John J. Franey <john.franey@att.com> Change-Id: Icee87694c61ff095095aeb0f766673eb7e785117