summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2017-12-09Updated git submodulesVenkata Harish K Kajur1-0/+0
Project: oom release-1.1.0 e9cb05d5ac608f3c0578f24fbd228b6a2d21cf17 Update resources and traversal to use amsterdam After the branch was cut these need to ensure to use the amsterdam branch instead of master Assumed that this is not the case since it was originally not using the clone but took the config files from aai-config and aai-data Issue-ID: AAI-548 Change-Id: Icd1896fced0ba493f8bbd2cd314183e67b792492 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
2017-12-09Updated git submodulesGary Wu1-0/+0
Project: integration amsterdam 73fc63427f511267f524198b9bf410e9b51351bd Avoid git pull failure when workdir has changes Change-Id: I1f304307b1c5dd25a2aa483e0ead3a28f2111a68 Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-12-08Updated git submodulesJessica Wagantall1-0/+0
Project: cli amsterdam 0d54aae957ca82b4d9605daaa961648ec22880b6 Bump patch version Bump patch version in preparation for Amsterdam branching Change-Id: Ia37a6a9673408262c9bd2ddf917f1a55a70462db Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Optimze invalid params check Issue-ID: CLI-83 Change-Id: I163251d99ff1cfaf3cbc20cf397cbab0b5d9a264 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> Fix yaml for servervice create command Make project-id as mandatory field. Change-Id: I7520d2b00535039a9d5b6c62de269dcf7ff9458c Issue-ID: CLI-55 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com> Update release notes to remove known issue section Issue-Id: CLI-70 Change-Id: I490ab87f8cfb19d413d216c1b9df68c2bc7ea103 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> Merge "Update ant script to add +x for onap.sh" into release-1.1.0 Update ant script to add +x for onap.sh - Update pom file to add +x permission for onap.sh - Add script for onap installtion Change-Id: Ib894dd99c5d81df2b5827454d3c296b43db46c58 Issue-ID: CLI-71 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com> (cherry picked from commit ab6474bc8ebfe212c0ad6c6fc6d61a97af56b9dd) Update the release notes Issue-Id: CLI-70 Change-Id: I8bb9c8ac946927c4c5502f1b5de742285d7228b8 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> (cherry picked from commit 06724c100bf526b0bc403bfab0deba3ad392a3cb) Merge "Set version to 1.1.0" into release-1.1.0 Set version to 1.1.0 Issue-Id: CLI-70 Change-Id: I2fd1fe4bff0bc5d8fd9d4734099c300610ea7d99 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> Tag unsupported command with Experimental Tag unsupported command with Experimental tag. Change-Id: If35ac905987c6ea9fb3112183001195c63ed290d Issue-ID: CLI-55 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com> (cherry picked from commit d92aff9d05c0f7e6e4bec0df70570517c7341362)
2017-12-06Updated git submodulesJessica Wagantall1-0/+0
Project: aai/aai-common amsterdam 7931f49ac5c06bd773ccf15d0a960fbe76231366 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I1333eff89702baba52b1cbca01d67bfddff44003 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-12-06Updated git submodulesPatrick Brady1-0/+0
Project: appc/deployment amsterdam 6633aeef0a879b6c8100ff83307882a31f09b7fc Fix docker versioning The docker tag script was modifed improperly causing the docker versioning to break. Reverting part of "Bump Patch Version" commit c9d8b5dd1a423bfdb87c7901209a84d93f33684d in order to fix. Change-Id: I10c75dbc8344ae1fc3d387c4eedadfb256ea6b57 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: CIMAN-120
2017-12-06Updated git submodulesMichael Lando1-0/+0
Project: sdc/sdc-docker-base amsterdam 1ad8114101ec68ead36de529cf3306b119b9cda7 update version Change-Id: Iec8ae38874fef32e09cd2fc8284045bf44b23740 Issue-ID: SDC-684 Signed-off-by: Michael Lando <ml636r@att.com>
2017-12-06Updated git submodulesGary Wu1-0/+0
Project: integration amsterdam dec0baa317b55fdda4f8b668eae835b6ac971286 Add commands to clean up resources Change-Id: I7bdcf9f1bbcd3af31165e9da658af01b36cf1238 Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-12-06Updated git submodulesGary Wu1-0/+0
Project: integration amsterdam 0793d6c94e9c8e71af02df2bd40524d3e7136e53 Use amsterdam branch heat template Change-Id: I62d502fb6c172aef88d7e379b654c559b7c641a4 Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-12-06Updated git submodulesMichael Lando1-0/+0
Project: sdc/sdc-distribution-client amsterdam 885ae10f541cf55b4b236bb57bbbec5e83825844 add sonar to distribution client Change-Id: Id41480b4b3d9ab5d96d478ba122b09fe541b09f5 Issue-ID: SDC-633 Signed-off-by: Michael Lando <ml636r@att.com>
2017-12-06Updated git submodulesMichael Lando1-0/+0
Project: sdc/sdc-tosca amsterdam e92347210e889d11e768180f90660a8538de8b3e add sonar to sdc tosca Change-Id: I26c1e512da88b06fe5d81cb7be2c5d65682c29d8 Issue-ID: SDC-631 Signed-off-by: Michael Lando <ml636r@att.com>
2017-12-06Updated git submodulesMichael Lando1-0/+0
Project: sdc/jtosca amsterdam 19cc8c33f1fba893e57cefdef7eafaaca99fca3b add sonar to JTOSCA Change-Id: Ic87fa456ec3833a8c33b2d127c1599ab95fad9b9 Issue-ID: SDC-632 Signed-off-by: Michael Lando <ml636r@att.com>
2017-12-06Updated git submodulesMichael Mokry1-0/+0
Project: policy/engine amsterdam 3f1933cfe1f5cdb6d3fefdff9248c9d4430849c2 Modified the code to fix various pushPolicy issues - Added modifications per Pam's review Change-Id: I5d67ee529cbc5245e7d1f8dbec6f2f2d453ce299 Issue-ID: POLICY-486 Signed-off-by: Michael Mokry <mm117s@att.com> (cherry picked from commit b6bae924c4a794cd772ac1524089fc8739e310b1)
2017-12-06Update submodule branch referencesRich Bennett3-0/+0
Update submodule references for repos that did not have an amsterdam branch on 11/22 Change-Id: I656a712e264f35b376e72f96adf478563aea6e55 Issue-ID: DOC-210 Signed-off-by: Rich Bennett <rb2745@att.com>
2017-12-06Updated git submodulesying.yunlong1-0/+0
Project: vfc/nfvo/lcm amsterdam 84e7e610d61a00b3cf0de7f18b97226b75a6662c Fix vfc-lcm url replace Change-Id: If0f22d33b12695959edbf18fbc505c5eafb2e5f6 Issue-ID: VFC-596 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn> (cherry picked from commit f8d29a66c886b51a24cae15ee1ac9a3da17c7ebc)
2017-12-05Updated git submodulesVenkata Harish K Kajur1-0/+0
Project: aai/aai-common amsterdam 4b655cd18a61ead082a1507da64a184e5744083c Change the openecomp logging service to onap Issue-ID: AAI-547 Change-Id: Idb3052879ad38f616f5bcb0dca33fe000f3eb199 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
2017-12-05Updated git submodulesPatrick Brady1-0/+0
Project: appc amsterdam 1ec98382a7648a5fecace0c96a1a11ec8eef9042 Missing plugin version (cherry-pick from master branch) Yang plugin had missing version causing build failure. For some reason, it just now became an issue. Change-Id: If9651a9cdc5f568cd2361fc0e1e80088843b1292 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-324
2017-12-05Updated git submodulesDan Timoney1-0/+0
Project: ccsdk/distribution amsterdam 1c5d85c1014b04ef38fcbdc74963fcd35b3978a3 Replace JDBC connector Replace mysql JDBC connector with MariaDB JDBC connector Change-Id: I1b8f019241192f0cd4e3ecb0bc8798e20ae033a9 Issue-ID: CCSDK-144 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-12-05Updated git submodulesDan Timoney1-0/+0
Project: sdnc/oam amsterdam 06afa3e1367d32e9ede6ae61d037c398cc8c8215 Update to use parent version 0.1.1-SNAPSHOT Need to use snapshot version of pom associated with Amsterdam mtce release (0.1.1-SNAPSHOT) Change-Id: Idfaa84d80366710b2077bc39080e79823f32138c Issue-ID: SDNC-211 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-12-05Add doc details Determe, Sebastien (sd378r)2-20/+31
Add details to the doc, like additional links or explanation. Change-Id: Ieb6cd46d3efd3a962d5f4febe646d8056197f25c Issue-ID: DOC-211 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-12-05Updated git submodulesSeshu Kumar M1-0/+0
Project: so amsterdam 527e255c512027e16a6df31d91753a9d27b8fe31 Merge "Correct Service Type Value" into amsterdam Correct Service Type Value Correct Service Type Value for E2E service Change-Id: Ia1f69acd4db2ed686673910c618e293a5a0b6338 Issue-ID: SO-354 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2017-12-04Updated git submodulesDan Timoney1-0/+0
Project: sdnc/oam amsterdam 01ee2a68be60554072a187280f3f4bce6e7319da Fix versions used in docker containers Docker containers should be using nexted staged version (mtce release version) instead of initial Amsterdam release version of maven artifacts. Change-Id: I8740dd7b54f24dd537b12953350f549bb4b9cc30 Issue-ID: SDNC-211 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-12-04Updated git submodulesJessica Wagantall1-0/+0
Project: aai/esr-gui amsterdam c56b8daa7c13b96c5feb2a583a98031ba508695b Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I730a78ce0bdf868a3724a4744e5347cb6a2dfdad Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-12-04Updated git submodulesJessica Wagantall1-0/+0
Project: aai/esr-server amsterdam 1bce7057fe1ca28d1767fcd8787ccb1a39964666 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I1297d144c59eb8a91c95cee1f80e3ce9044d19f8 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-12-04Updated git submodulesfujinhua1-0/+0
Project: vfc/nfvo/lcm amsterdam 3f6fd019db0bd265a3a761e3b51a00160b19927d Update service name of ztevnfmdriver Change-Id: I8629ad1aea6a9f7c145ecb75e63215ff34b1b5e2 Issue-ID: VFC-606 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn> (cherry picked from commit 6260d644ff043f8f132fa5a9165b34a8d781d5df)
2017-12-04Updated git submodulesJessica Wagantall1-0/+0
Project: usecase-ui amsterdam 1962e924b50f09f0d96f408fa761efec40ea6d67 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I2b3a10afe40a6c65f9b83acb7a178e17926b79aa Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-12-04Updated git submodulesJessica Wagantall1-0/+0
Project: sdc/sdc-workflow-designer amsterdam e1ee7414df9ce8515951c7a84db000ca47ae073d Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: Ib365152ac4b88c58899ab7437b27702b26a01b63 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-12-01Updated git submodulesPatrick Brady1-0/+0
Project: appc/deployment amsterdam efc8ecc72f7069e2c8969eff5b6cc60b125905f2 Add appc version properties (cherry-pick from master) When we increment the version of the deployment project, builds will currently break since the version will be one ahead of the released version of appc. Adding properties to define the version of appc to download. Also adding a script to determine when snapshot or release version should be used. Change-Id: I8e98dbc8ca79e0ec6a02fb011c17053c728c351d Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: CIMAN-120
2017-12-01Updated git submodulesJessica Wagantall1-0/+0
Project: appc/deployment amsterdam c9d8b5dd1a423bfdb87c7901209a84d93f33684d Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I8d3baa2dec304db733c7a331bee720418f1e77af Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-12-01Updated git submodulesJessica Wagantall1-0/+0
Project: integration amsterdam e368e572b9370d0ffb2ff0fda2d4fc5ac3077cc4 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I74c06afd8db8cd8734ac2325df58355937ca5d82 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-12-01Updated git submodulesDan Timoney1-0/+0
Project: ccsdk/parent amsterdam 9f4482ab684c651f31367662061d015f08ebc7a3 Add staging plugin config Staging plugin must be explicitly in pom.xml - does not seem to work if it is pulled in from parent pom Change-Id: I329a9674258698e1bb62d53eca4585c8c1dfac31 Issue-ID: CCSDK-148 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-12-01Updated git submodulesDan Timoney1-0/+0
Project: ccsdk/parent amsterdam 0cd6725a4535b331265b2a960afb1cfe92cd6adc Use version 1.0.0 of oparent Should use version 1.0.0 of oparent Change-Id: I30933cff36b8b6a914a00058e13366b4af922ffc Issue-ID: INT-356 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-11-30Updated git submodulesJessica Wagantall1-0/+0
Project: dmaap/messagerouter/messageservice amsterdam 0ffefa587076ac88f943007ae3b20a3cc7aa0930 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I93a5523e0828393d935c9f83d1b905d5f3dc89bb Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-30Updated git submodulesGildas Lanilis1-0/+0
Project: multicloud/framework amsterdam 1d4dec4f6c475bb069fd807b6059b46a5644caf3 Add reference for proper linking Add reference in index.rst so propoer linking can be accomplish for other readthedocs pages. Issue-ID: DOC-203 Change-Id: I484f018f6ac4745df9d4df8e9ef61418e8312d2a Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com> (cherry picked from commit 39096ae6373df60a059fd6545cae730393e9a24e)
2017-11-30Updated git submodulesGildas Lanilis1-0/+0
Project: clamp amsterdam 25c12c8529fe5b4ad453fed78cfdbff8181f28ff Add reference for better cross links Add index index-clamp-installation for crosss reference Issue-ID: DOC-203 Change-Id: I7f7555f829965982b31aa4baa549cc2709c7d02a Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com> (cherry picked from commit 53f4973f159c8649a6d8a102fd82d82f5b01d2ba)
2017-11-30Updated git submodulesJessica Wagantall1-0/+0
Project: modeling/toscaparsers amsterdam 27e3e742d907eff6f004ecbe1655bbd6d4854098 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I7b6d86cda05d5276c436bac5fa030cea4ddb58e4 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-29Updated git submodulesJessica Wagantall1-0/+0
Project: so/libs amsterdam 2552027e08ab094d44d6f51162d1753997880dda Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: Ife42c0087ed9a4d26bfb99ccdbb2cce59cb58a14 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-29Updated git submodulesSeshu Kumar M1-0/+0
Project: so amsterdam 9cba4e191d714480e8213478f0949eb9cfc0ce3f Merge "Bump patch version" into amsterdam Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: I909bb58e7fd1f98ea2342f19205b57e42c0302ad Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-29Updated git submodulesJessica Wagantall1-0/+0
Project: vfc/nfvo/lcm amsterdam e5d9c542ad1c8047653311f9986defef842b8b68 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: Ie3e934c7bddb580a7bc682920e49a4321ec0e3b3 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-29Update content of Integration pageGildas Lanilis1-5/+2
-remove link to former submodules/integration.git/docs/index.html -add link to new getting ONAP installed -add link to manifest file Issue-ID: DOC-203 Change-Id: I8f4c470aceb89295db09116e73cb9cd57edb4614 Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com> (cherry picked from commit c02635538ec7b32ee7bba2bea37c8a9ad6d8c8a3)
2017-11-28Updated git submodulesGildas Lanilis1-0/+0
Project: aai/aai-common amsterdam ef00c9ecb7b7bdb56a39d7ff299b3caf893c5571 Update typos and format -Remove template note -Fix typo -Update format Issue-ID: DOC-204 Change-Id: I913d68d50ab6dd2546c2e209e5335412a1a6aafd Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com> (cherry picked from commit 43cb52e7951837212e9673c598124330add0fc31)
2017-11-28Updated git submodulesTony Hansen1-0/+0
Project: dcaegen2 amsterdam 10dcd010eab755eb644297940b7d40062889c233 Merge "Fix Doc8 errors" into amsterdam Fix Doc8 errors Issue-ID: DCAEGEN2-197 Change-Id: I7de01b8c52ae7919f3d8d4f6545a53b026096ab9 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com> DOC: release notes updates Change-Id: I8d88d65c1c5be9e114b6aab60d70b6e36464a75f Issue-ID: DCAEGEN2-194 Signed-off-by: Vijay <vv770d@att.com> Fix editorial errors Modify ONPA by ONAP Correct some JSON file example Add code-block for code snippet Change-Id: Ia313b6adc615bcd353f4e3c3e363c3f854d25181 ISSUE-ID: DCAEGEN2-199 Signed-off-by: Eric Debeau <eric.debeau@orange.com> Improve documentation Issue-Id: DCAEGEN2-199 Change-Id: Id5e3f3e57e86debe41b7df7986c9d8a808b2752f Signed-off-by: Lusheng Ji <lji@research.att.com> Cherry pick from master, add defaultbranch Issue-ID: DCAEGEN2-206 Change-Id: I363a9331afa1bad33586aa2de34af9c3e6716532 Signed-off-by: Lusheng Ji <lji@research.att.com>
2017-11-27Updated git submodulesJessica Wagantall1-0/+0
Project: appc amsterdam 9e17fa3e7a4823d6585c64581ba8687b07b11844 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: Ie9235cdc12dc487699f50167199ca17834bc9ffd Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Signed-off-by: Patrick Brady <pb071s@att.com>
2017-11-27Updated git submodulesPatrick Brady1-0/+0
Project: appc amsterdam 0610db3a7fd6e3e2ea2880c9f3114445cfb85984 Removing snapshot version (cherry-pick from master branch) Change-Id: I7fa9000d157f61cb46ce6c15d4a59d4da53f2c89 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-318
2017-11-27Updated git submodulesJessica Wagantall1-0/+0
Project: dcaegen2 amsterdam 6816bc89bf1e6a814442725bab8a92df5a2bb838 Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: Id6fcf205713750597a5fd41e0d5db8059b4a7e10 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-27Updated git submodulesDan Timoney1-0/+0
Project: ccsdk/parent amsterdam e93b75f8a145db651274ef7f992d7145fc7c98ee Fix oparent version Release version of oparent is 0.1.1 not 1.0.0 Change-Id: Icc723c6e2abab0dc21a10b3c1dee274615c54972 Issue-ID: CCSDK-147 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-11-24Include 4 repos w/out amsterdam branch @ masterRich Bennett4-0/+0
Referencing logging-analytics, modeling/modelspec, oom, and sdc @ current head of master branch. Change-Id: I535be74fbbac51323903c539111b3a7d51264576 Issue-ID: DOC-98 Signed-off-by: Rich Bennett <rb2745@att.com>
2017-11-24Synchronize with submodule amsterdam branchesRich Bennett28-2/+2
Change-Id: Ib277bbac6ef2cef6597c11436c98de63d29eded8 Issue-ID: DOC-98 Signed-off-by: Rich Bennett <rb2745@att.com>
2017-11-23Updated git submodulesMorgan Richomme1-0/+0
Project: clamp amsterdam 7de0a19c8b92b3a7d74e0149a7de712e06ba701f Fix Doc8 error JIRA: CLAMP-71 Change-Id: I073290ff655aa23b0d705f7e815b466bf82cb35d Signed-off-by: Morgan Richomme <morgan.richomme@orange.com> (cherry picked from commit f391c6ca9ee635c25f57f217e3280cb25e42ac9f) Bump patch version Bump patch version in preparation for Amsterdam branching. Change-Id: Ia957ce649e9ed6eeaf9aa671b6c6af3cced16516 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-22Merge "Improve doc to install individual cpts" into amsterdamRich Bennett2-5/+7
2017-11-22Merge "Fix Typo and URL in readthedocs" into amsterdamRich Bennett1-12/+2