summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-05-24Update git submoduleskanagaraj Manickam k003651061-0/+0
* Update docs/submodules/vnfsdk/model.git from branch 'master' to b0cfdb6745404208b0f339c6ad04fc47aa3f813f - Add docs for VTP Issue-ID: VNFSDK-408 Change-Id: I0c58e15b065e5a6abe5cbe0ea1323f08a82899b0 Signed-off-by: kanagaraj Manickam k00365106 <kanagaraj.Manickam@huawei.com>
2019-05-24Update git submodulesSai Gandham1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to a47bd51641efcb84e19d68a6383f0947df826636 - more junits to auth cass module Issue-ID: AAF-111 Change-Id: I7a1d2fd1568c9270174133e266d9590fe769dc7e Signed-off-by: Sai Gandham <sg481n@att.com>
2019-05-24Update git submodulesYang Xu1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 0878becb0a3fd95d158fc2f161ab7be4028c85b7 - Merge "update oom version" - update oom version Change-Id: Ic723624865b200ea025602aee0ec60efb4b9a09f Issue-ID: VFC-1373 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-05-24Update git submodulesjhh1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 9a86720a7664271d9015c652ec8180adb7bae4a2 - Bump image versions to new releases Change-Id: Ibbe2169bbebc7df1fe628760fb1980cf92aeff9e Issue-ID: POLICY-1700 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-05-24Update git submodulesMatthieu Geerebaert1-0/+0
* Update docs/submodules/externalapi/nbi.git from branch 'master' to 4978487f9e6732b4742c6605472114f16a494777 - Update to 4.0.1 Change-Id: I1a98e78c4b14ecd018ceb273026de5980c7f3ea6 Issue-ID: EXTAPI-252 Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com>
2019-05-24Update git submodulesliboNet1-0/+0
* Update docs/submodules/multicloud/framework.git from branch 'master' to 0566fc507f64578ab37c4bce1abaaad8d5528169 - Fix data incomplete and not json format the user needs to know the resource information and need to get the json format Change-Id: Id17be27016082bd7c42f8aa6f7a8aa25017e2c8b Issue-ID: MULTICLOUD-651 Signed-off-by: liboNet <libo.zhu@intel.com>
2019-05-24Update git submodulesMatthieu Geerebaert1-0/+0
* Update docs/submodules/externalapi/nbi.git from branch 'master' to a0dfe9bc184690949719896036e8c5b34681d425 - Merge "permissions failing when tosca parsing" - permissions failing when tosca parsing -fix dockerfile -add check in sdcclient Change-Id: I84fcbf6289a692168def37ee50c3c3b33945e15f Issue-ID: EXTAPI-249 Signed-off-by: romaingimbert <romain.gimbert@orange.com>
2019-05-24Update git submodulesjanani1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to bd8f3c044a690772dc1855a0b8f678d9b56f5142 - Bug fix to add restconf api node in DG Restconf api node in DG Change-Id: I5bcd79073a442cc8ca532f3c2a1560f2867803c4 Issue-ID: CCSDK-1344 Signed-off-by: janani <janani.b@huawei.com>
2019-05-24Update git submodulesMichal Ptacek1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to aaf39b1e4cc736fa6f192d46549afaab303c350d - Merge changes from topic "data-download" * changes: Improve download of npm packages Improve download of http files Improve download of rpm Improve download of git repositories Improve docker image download script - Improve download of npm packages Issue-ID: OOM-1803 Change-Id: I332d7ef6ad628a08b5c9279d65b9d7286f06ee97 Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com> - Improve download of http files Issue-ID: OOM-1803 Change-Id: If2aeb1aa4fab27641511a6300832ccd7be95e846 Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com> - Improve download of rpm Issue-ID: OOM-1803 Change-Id: I8a6df03a5ede68968e9ccdf8d4de3f9f17d91963 Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com> - Improve download of git repositories Issue-ID: OOM-1803 Change-Id: I167f66f3cb6b96d9e21c5ffbd0cf0eb33ef4932e Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com> - Improve docker image download script This is part of the series of changes that will improve download scripts. Issue-ID: OOM-1803 Change-Id: I6606762f8e05c25132257e5612997418a9d6d701 Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com>
2019-05-24Update git submoduleseronkeo1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to 507bda29594ce40ed66830183ec5647f39031299 - Fixing typo in download-pip.sh script Change-Id: I1216cb0fc2f47f29ef7f3880a03f4e6a3dfd3ec4 Issue-ID: OOM-1879 Signed-off-by: eronkeo <ronan.keogh@est.tech>
2019-05-24Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to e0950730de4543af8e3fd672e80feff540e6483d - Bump to 1.4.2-SNAPSHOT Released 1.4.1 Issue-ID: POLICY-1700 Change-Id: Ied6d06664155ff6e44ede90f1c081ec5bd2ef679 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-05-24Update git submodulesDeterme, Sebastien (sd378r)1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to ef9aed4b3a69128fa10feaa9ab787a57ef6772d7 - Bump Clamp version Bump the clamp version for the new release Issue-ID: CLAMP-395 Change-Id: I42d695518b8268c817eef8b4d28d3a6700f6aba4 Signed-off-by: Determe, Sebastien (sd378r) <sebastien.determe@intl.att.com>
2019-05-24Update git submodulesDeterme, Sebastien (sd378r)1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 3b48f829b1325fa6675b8981c119d822a5ea1b13 - Fix op policy payload The payload should contain a different content value, not the entire yaml Issue-ID: CLAMP-395 Change-Id: I7311caffed554f3c97ef7e07c729266a4fe30940 Signed-off-by: Determe, Sebastien (sd378r) <sebastien.determe@intl.att.com>
2019-05-24Update git submodulesMichaelMorris1-0/+0
* Update docs/submodules/so.git from branch 'master' to a7160456335b2ce3710efd00658711d431eac0b4 - Calls to/from VNFM fail Issue-ID: SO-1909 Change-Id: I2f8a19dfd456316e5436be4e85d8a384d7d5ed6f Signed-off-by: MichaelMorris <michael.morris@est.tech>
2019-05-24Update git submodulesliboNet1-0/+0
* Update docs/submodules/multicloud/framework.git from branch 'master' to 8b38222e46064156985f0e6425207479fd2c975e - Upgrade to 1.3.4 This should be done once 1.3.3 artifacts are released Change-Id: I5699ae11007c6b2427fa94113345377cb24fcf34 Issue-ID: MULTICLOUD-652 Signed-off-by: liboNet <libo.zhu@intel.com>
2019-05-24Update git submodulesyangyan1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 6af8ffa7960ecba33fc78e03e116ec7fc67a74a9 - update version to 1.3.2 Change-Id: I1da7fe356ca12f0146885e9779f66b1ce8cea77a Issue-ID: VFC-1394 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-05-24Update git submodulesliboNet1-0/+0
* Update docs/submodules/multicloud/framework.git from branch 'master' to 79f626b0c4419dfcb5b7d1ea0a279a523c6c21bd - Fix port mismatch and return value judgement issue . the port of k8s plugin has changed from 8081 to 9015 . the value from 200 to 300 is acceptable from k8s plugin Change-Id: I85c61d2275c7913f8c8dbeee0751349552bec29d Issue-ID: MULTICLOUD-650 Signed-off-by: liboNet <libo.zhu@intel.com>
2019-05-24Update git submodulesBin Yang1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 574eb961e8651ba4e4f0f92d7984a2716e5e64f7 - Merge changes from topics "broker_response", "develop" * changes: Update broker responses to match spec and SO Minor change to instance response - Update broker responses to match spec and SO The broker responses need to match the spec and what SO expects as responses. CREATE_COMPLETE instead of CREATED in both POST and GET DELETE now returns a response body GET by name is now supported Name is an alias for vf_module_id which is expected to be provided as an attribute in sdnc_directives in the original POST request Issue-ID: MULTICLOUD-645 Change-Id: Ifeca755a07298d0a858cbe9e80f9ce654d6d21b8 Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com> - Minor change to instance response Minor change to instance response. Now it includes the full request parameters in the response. Issue-ID: MULTICLOUD-649 Change-Id: Ia4a7e479f842dd580bcfb13aa91dc0b0a456cf25 Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
2019-05-24Update git submodulesweinstock, alan1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to 0531bd6bf390d8c23505326c4524496983419654 - [VNFRQTS] updated requirement R-10834 Issue-ID: VNFRQTS-646 Signed-off-by: weinstock, alan <aw2574@att.com> Change-Id: Ida2e15c8beb34fdc9a9a20fb746295eb4603d4e1
2019-05-24Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 094dd6840bfa4cebc120b0735797ff3617371296 - modify usecase-ui pom files Change-Id: Ic45a790160522047e6dbcf868a7fcf0363008c49 Issue-ID: USECASEUI-259 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-24Update git submodulesvrvarma1-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to b6d3f10fa850af99edbf3476b465ae68902d8d11 - Update the pciopt request to accept empty anrInputList Change-Id: Ia029867262aede2bd351dd046bc7c1483a408c09 Signed-off-by: vrvarma <vv8305@att.com> Issue-ID: OPTFRA-505
2019-05-24Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to f63ac5da45f5e99f2034cbadbc79cc466e9f28eb - Fix instance detail for CCVPN Change-Id: I98ed4cd2f5a454ba22353fd8364be82ed0aaee76 Issue-ID: USECASEUI-222 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-23Update git submodulesWelch, Lorraine (lb2391)1-0/+0
* Update docs/submodules/portal.git from branch 'master' to 5260297bb0fdd7ca1640b45a4c9b96b7fd158a1e - Dublin Release Notes for Portal Issue-ID: PORTAL-592 Signed-off-by: Welch, Lorraine (lb2391) <lb2391@att.com> Change-Id: I93a2ff82f52f709d12bfa92c0d14859d2298b6a1
2019-05-23Update git submodulesMarcus G K Williams1-0/+0
* Update docs/submodules/so.git from branch 'master' to 95a2dabaee827528695be6819b15eb3e67fc685f - Fix Build -Use latest SNAPSHOT appc client-libs Issue-ID: SO-1921 Change-Id: Id20f8f7d77469e8123317447aa974a3e77103761 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2019-05-23Update git submodulesVijay VK1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to edaf8b1d69fa97862bd246dc61c1e4e77a01b5be - Fix doc issues Change-Id: I711a40a64a1d47b50f0923ba67b02ad121ace5b4 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-1505
2019-05-23Update git submodulesInstrumental1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to aab276e679f221b37fc6be37e5dd0ffd72ffc406 - El Alto start with 2.1.14 Issue-ID: AAF-834 Change-Id: I35cb2c87889f8ed51527c4cd5cfa79789ccd20b0 Signed-off-by: Instrumental <jonathan.gathman@att.com>
2019-05-23Update git submodulesa.sreekumar1-0/+0
* Update docs/submodules/policy/apex-pdp.git from branch 'master' to 4b890c78baa7e6ea42a02e140e608491ccb0aa63 - Update Apex PDP Documentation Updating the Apex PDP documentation to support the new architecture. Change-Id: Ice4d91080d57504d10db24ada08757ae3d03afd3 Issue-ID: POLICY-1682 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-05-23Update git submodulesHaibin Huang1-0/+0
* Update docs/submodules/integration.git from branch 'master' to d8d2be9554c9ee55a7b1b35946f1ee516b41c8eb - Automatically add default policies Change-Id: I38fcd336e7eca90264590d4174c8cf65e89c60a1 Issue-ID: INT-795 Signed-off-by: Haibin Huang <haibin.huang@intel.com>
2019-05-23Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to c89dd8b0e3f15a4aa56c4489349c56c6715e06bc - Merge "Add org.onap.so.cloud-owner" - Add org.onap.so.cloud-owner Add org.onap.so.cloud-owner Issue-ID: SO-1869 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: I2725e79a1730645f025cb354cb3db60553fb482c
2019-05-23Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 8fed1bff1a7b0477ba7e9b330ec1108f84df295b - Merge "Use constant type instead of nf-role in naming policy" - Use constant type instead of nf-role in naming policy Change-Id: Ic1e5d773629c4c973a78075faf8b7f601f28321d Issue-ID: OOM-1838 Signed-off-by: Marco Platania <platania@research.att.com>
2019-05-23Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to bf59f79f03316b85d5c100f152ceb6921e30a9fb - Merge "Change portal-rest-url to internal cluster port" - Change portal-rest-url to internal cluster port Change-Id: I9d42bd57b3c0c989fdbd91d284dbc7d5f2d9d658 Issue-ID: POLICY-1766 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-05-23Update git submodulesvrvarma1-0/+0
* Update docs/submodules/oom.git from branch 'master' to d777848a95ca00678983397fdca79b958d985b33 - Add oof-osdf san to the aaf certificates The oof-osdf SAN was not in the aaf certificates Change-Id: I6be4e56e0ceb29c2c53ca43a6b6bbd20076bc074 Signed-off-by: vrvarma <vv8305@att.com> Issue-ID: OPTFRA-499
2019-05-23Update git submodulesaosull011-0/+0
* Update docs/submodules/externalapi/nbi.git from branch 'master' to 822e3c812b1b2abdd310de060a023081c48f69b5 - Disable SDC distribution topic polling Change-Id: Icfae90e55fff828eda647ca31af5e15fbdca26b5 Issue-ID: EXTAPI-248 Signed-off-by: aosull01 <adrian.osullivan@huawei.com>
2019-05-23Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 1321f2095d4259a2b985030702f713d95feee715 - Fix instance instantiation for CCVPN Change-Id: I2d8a9b4e868bb74d4409540d46ce87e604e17c57 Issue-ID: USECASEUI-220 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-23Update git submodulesTao Shen1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to d045d2d97b28dab10805a257e1747e926e43d0fa - Merge "Fix instance detail for CCVPN" - Fix instance detail for CCVPN Change-Id: I67dcc0adc46838c45c87470abbc35e08a0e6ab21 Issue-ID: USECASEUI-222 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-23Update git submodulesguochuyicmri1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to e0503c445cbb07f2075ef17b22061e304a203119 - User and service type management interface Change-Id: I8cc018600880433891a434f312c37f97fc2e6107 Issue-ID: USECASEUI-211 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
2019-05-23Update git submodulesosgn422w1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to cbc6af30f0b9b9158d5937ab52b4366f5cb6999e - make kibana https introduce certificate so access to kibana is https only Issue-ID: OJSI-147 Change-Id: I69e52cb4cb801b9d890c41090c871badd210ad35 Signed-off-by: osgn422w <gervais-martial.ngueko@intl.att.com>
2019-05-23Update git submodulesojasdubey1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to f3a1aa08a8339ce312013154550c8e8b637f0fc3 - Fix service proxy node type Added properties, interfaces and requirements of the child service to the node type of proxy in the parent cherry picked commit from dublin: e50b5687b62edbafa12bf3825b0441077c5a4820 Change-Id: I2b4bb695c0b3819ada889b144d536b48dd9d1f30 Issue-ID: SDC-2313 Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
2019-05-23Update git submodulesGuangrongFu1-0/+0
* Update docs/submodules/holmes/rule-management.git from branch 'master' to 90b740e99be5e6ddb3bccc6f2840c707acf74f92 - Updated Docs Change-Id: I0c51e78ec3347206d1655ef7e34a09893476378b Issue-ID: HOLMES-228 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
2019-05-23Update git submodulesyangyan1-0/+0
* Update docs/submodules/modeling/genericparser.git from branch 'master' to b3fb8b6f092622b00f7273ec6ff9f78c76208652 - update log.yml Issue-ID: MODELING-170 Change-Id: I970a3d55a9cc4279b93daa345c98b82f3e78fcf3 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-05-23Update git submodulesyangyan1-0/+0
* Update docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git from branch 'master' to 5fa5f4e2afa00ee7287be0b7fda43228860b6537 - fix version to 1.3.1 Change-Id: Idddb8f4103ff28137190ea76efb2a44d9658df68 Issue-ID: VFC-1388 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-05-23Update git submodulesKevin Scaggs1-0/+0
* Update docs/submodules/modeling/modelspec.git from branch 'master' to bbf1c746723814a7adbf94b5c6ce40ae86b83dd7 - Updates to Vnf submodel Updated attributes in VirtualLinkProfile and VirtualStorageDesc from experimental to Preliminary per ETSI 2.5.1. Issue-ID: MODELING-104 Change-Id: I2214e7823355c0f9d4a347d5c6231277670336ed Signed-off-by: Kevin Scaggs <ks0567@att.com>
2019-05-23Update git submodulesBin Yang1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 3eeb40cfe56366ca72e811bdfb6f2faf127f8a2f - Merge "Adding helm charts for vFirewall." - Adding helm charts for vFirewall. The charts are complete with templating and basic constructs. They need to be modified in terms of chart dependency and also address network configuration. Addressed comments, changed network config values and included subcharts. Removed redundent vars. Removed shell vars and updated sink. Updated vars. Removed escape chars from password which and removed comment in pod annotations. Removed comments from network files. Changed the deployment file lables for all 3 charts. Extricated some of the values addressed by comments. Set global vars. Updated sink-service labels. Change-Id: Id6fc2e066c8a6c5b33b65caae3a49637521c3133 Issue-ID: MULTICLOUD-628 Signed-off-by: Akhila Kishore <akhila.kishore@intel.com>
2019-05-23Update git submodulesItohan1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 989678694e5960cb43ea5c0d37052b736b639423 - Fixed bugs in CLI commands -Fixed bug in get-resoure-module-name -Changed vf-module-delete, vnf-delete and service-instance-delete to use AAI API instead of SO -Delete vf-module-delete, vnf-delete and service-instance-delete amd service-show-resource-module-name files from SO directory Issue-ID: CLI-163 Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com> Change-Id: I4f9a80751d19d31db8e8a23dbaa42161b9de38c2
2019-05-23Update git submodulesliboNet1-0/+0
* Update docs/submodules/multicloud/framework.git from branch 'master' to 9bd32245361a16cc643219909df35b21949798c3 - Upgrade to 1.3.3 This is to workaround that 1.3.2 releasing failure Change-Id: I70804a0bb2e5fa358fcf4a33cab937a718d84b34 Issue-ID: MULTICLOUD-648 Signed-off-by: liboNet <libo.zhu@intel.com>
2019-05-23Update git submodulesMichael O'Brien1-0/+0
* Update docs/submodules/logging-analytics/pomba/pomba-audit-common.git from branch 'master' to 40a3a65331c9a001b92be54e18ab5a27b9257bc4 - logging ptl is now Prudence Au Issue-ID: LOG-1053 Signed-off-by: Michael O'Brien <michael@obrienlabs.org> Change-Id: Ic09e79871310c614b0ed7d0b80b43db63e433fbf
2019-05-23Update git submodulesMichael O'Brien1-0/+0
* Update docs/submodules/logging-analytics.git from branch 'master' to 592c36f506b19ad2af2d16917fd079bd49e3b0ef - logging ptl is now Prudence Au Issue-ID: LOG-1053 Signed-off-by: Michael O'Brien <michael@obrienlabs.org> Change-Id: I37dbd0638a6a7340cb334346ef168a16b6f8c7e5
2019-05-23Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 352080a39d582a767d5908ab3372ac10d59a2261 - vFW usecase update Update vFw Uses case to use 1.5.0 artifacts. 1.3.1 artifacts were removed from nexus this week. Changed sink container to remove IP addresses that are built in the image and can't be changed or parametrized. Added a configmap for sink container Change-Id: Ib1aae1816de866889e93d61a77832680764acef6 Issue-ID: MULTICLOUD-623 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2019-05-23Update git submodulesVijay VK1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to f9e4344e9c9834face106b6c153ede020ff5410f - dcae r4 doc updates Change-Id: I341f10a9eace4facac5aec3a3ff56cb89ef005e8 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-1505 Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
2019-05-23Update git submodulesJessica Wagantall1-0/+0
* Update docs/submodules/modeling/genericparser.git from branch 'master' to 8de3f22eefe96b80379a698e69264a131bbc636a - Migrate Nexus2 releases to global-jjb Update oparent version to 2.0.0 which supports global-jjb maven-stage job. Issue-ID: CIMAN-250 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: Idac177f5a00c43b15f9cad7554829e57f9d06d66