summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master c07e0dc46ad232c8cd86f19b4aaaab0ef9db409f Merge "TopicService-replace type with diamonds" TopicService-replace type with diamonds TopicService.java - Replace the type specification in this constructor call with the diamond operator ("<>"). Issue-ID: DMAAP-934 Change-Id: I74c83f83e75fb26ddd56f8df6a5a0ff572d6f74e Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master b2668789b9e7af9a40c234a4dcbbb7a14df97627 Merge "IssueFix-Replace type with diamonds" IssueFix-Replace type with diamonds AafLurService.java - Replace the type specification in this constructor call with the diamond operator ("<>"). Issue-ID: DMAAP-925 Change-Id: I6f1309c3270198e55bccfb365776fd27ebc1d5fd Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master f633d09a8006467fb94f0fe9e44133f5c36434f0 Merge "Use a logger to log this exception-AafConnection" Use a logger to log this exception-AafConnection Exception is already logged using logger. deleting the printstacktrace. Issue-ID: DMAAP-924 Change-Id: I2eda3c840af3cd61d429373dccd046e19e076be4 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 2023a02a1325cd710079e72b8369fa1bbea666cc Merge "AafLurAndFish.java-logged exception" AafLurAndFish.java-logged exception AafLurAndFish.java - Either log or rethrow this exception Issue-ID: DMAAP-928 Change-Id: Ib023e3e247f741191bf5639cb2ca740221a52f7c Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master cdfa6473b791c4c99a4b97cf6c91c97446b1cdea Merge "DrProvConnection.java-Remove unused import" DrProvConnection.java-Remove unused import DrProvConnection.java - Remove unused import Issue-ID: DMAAP-929 Change-Id: Id0b64973830792fb5390fd5ed5b35654d76128c4 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master a7656548fe9bf4f0ef1c8e0ddc271aba4efc3f48 Merge "MrProvConnection.java - Remove unused imports" MrProvConnection.java - Remove unused imports MrProvConnection.java - Remove unused imports Issue-ID: DMAAP-929 Change-Id: I831bafb9d706d764de8f879a42ab3c2a9f45e853 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master d6ac89166652a7ac7ecf3ee25477a970e3bcd482 Merge "MrTopicConnection.java-fixed string comparion" MrTopicConnection.java-fixed string comparion MrTopicConnection.java - Move the "https" string literal on the left side of this string comparison. Issue-ID: DMAAP-931 Change-Id: Ia8217bd68c63e07a45cb064bf77bdf91934ffdff Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 2006bedb6a0cf54d6031a3a390defc4a851b53f1 Merge "FeedService-Fixed String Comparison" FeedService-Fixed String Comparison FeedService.java - Move the "startsWith" string literal on the left side of this string comparison. Issue-ID: DMAAP-935 Change-Id: I63c07fcb2c9aaae2dba9ecc9ee90775344ec64ed Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 2f31db57d0b46089b96b0816257352ca837919d1 Merge "DR_NodeService-Removed unused variable" DR_NodeService-Removed unused variable DR_NodeService.java - Remove this unused "resp" local variable. Issue-ID: DMAAP-936 Change-Id: I1c90f2ba9ac69838a718471c7ed34e56b6a6aaab Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 83680b266e5edea3487d1b662af4f3f1466a1013 Merge "DR_SubService-Fixed String comparison" DR_SubService-Fixed String comparison DR_SubService.java - Move the "Yes" string literal on the left side of this string comparison. Issue-ID: DMAAP-938 Change-Id: Ic81157a8dbe7034b0f2bbe89ff20c4ae33a4ab65 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 1683994d9aa50a907010191b8ede7064b1c72cb2 Merge "MR_ClusterService-replace & with &&" MR_ClusterService-replace & with && Replaced & with the correct comparsion operator && in MR_ClusterService.java Issue-ID: DMAAP-943 Change-Id: Idaaa4f9ad3e1961e05d2a9f07de466d5f738417e Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master cdb4b047f06559ceb67963a95b225dc032d3e7f9 Merge "JettyServer-Removed unused Imports" JettyServer-Removed unused Imports Removed unused imports Issue-ID: DMAAP-944 Change-Id: Ifdc1607899285a0fbdbd82eade01a9b2f3b81b30 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 74df913ac796cbfe51991ddb288db0e8794cb95a Merge "Feed-remove useless assignment to variable" Feed-remove useless assignment to variable Feed.java - Remove this useless assignment to local variable "ret". Issue-ID: DMAAP-945 Change-Id: I5905cbd3ccc3359afb2a0b8ec9a4849e916e2a8a Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 78600e2d5302e047f096011bcfa96e90501fb186 Merge "DR_SubResource-remove comment-out lines" DR_SubResource-remove comment-out lines DR_SubResource.java - This block of commented-out lines of code should be removed Issue-ID: DMAAP-953 Change-Id: I706216b59eee6d66b373b6ae045b8a6df4f3d109 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master e4c09109687f4479c13c67efdb04756b205ab119 Merge "DmaapService-removed unused imports" DmaapService-removed unused imports DmaapService.java - remove unused imports Issue-ID: DMAAP-954 Change-Id: Id582e54aee9846e847a720a11c6b01ba71b09773 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 437d6980085ec09659ce0e55e3baca4af142558e Merge "Graph-removed unused imports" Graph-removed unused imports Sonar Fix - Graph.java - removed unused imports Issue-ID: DMAAP-955 Change-Id: I711f972fce9eed05c4c58d0ba03ca84e99c1b1b8 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesvarun gudisena1-0/+0
Project: dmaap/dbcapi master 2e95d8bbbf6eb8d17166af1c2c2c32481796a83c Merge "Junit for Fqdn.java" Junit for Fqdn.java Junit for Fqdn.java Issue-ID: DMAAP-962 Change-Id: Iccfd60f2de138ad786de3e6c1ee97b4f4886bca6 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesdglFromAtt1-0/+0
Project: dmaap/buscontroller master 7a107760435f70283b71232d354652532c3e776a Update artifact dependencies for CLM issues Change-Id: I5d77b8eb0e9449ff5725832c9d8914f11da3cd5a Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-987
2019-01-22Updated git submodulesVictor Morales1-0/+0
Project: multicloud/k8s master f26259e651ee0be263a3398d2d0ca0eb27c8995c Merge "Fix sorting with right index value" Fix sorting with right index value Fix the less function used in sort.Slice with the right index. I am using the same index which obviously will not work. Issue-ID: MULTICLOUD-439 Change-Id: Ibb78c03d67cf59e3941acc786796d0cc69b4f0aa Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
2019-01-22Updated git submodulesVictor Morales1-0/+0
Project: multicloud/k8s master 073d2f7806257f27b5b92088dc59ae5a98ae6c38 Merge "Delete content when a definition is deleted" Delete content when a definition is deleted When a definition is deleted, delete the content too. Not deleting the content would leave blobs of data that is not connected to any metadata in the mongo database. Issue-ID: MULTICLOUD-393 Change-Id: Ifae55bab0affc22b06b1069a27cd90af6f7d5d98 Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
2019-01-22Updated git submodulesVictor Morales1-0/+0
Project: multicloud/k8s master f2cc3c1a20b9d817f3e4efe3c66a6133d5fb3804 Merge "Enable statd service" Enable statd service NFS uses rpc-statd service to provide locks. These service needs to be started separately. This fix enables that service to prevents 'no locks available' message errors. Change-Id: I37263226072db2b064e02811ed397bb3040254b7 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
2019-01-22Updated git submodulesdglFromAtt1-0/+0
Project: dmaap/dbcapi master ca5d23b1d15d808d9d2924e1c870f50742899c53 Update artifact dependencies Change-Id: I6ea4742b489dd91074d22f44048ad7fc4720a0aa Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-987
2019-01-22Updated git submodulesBenjamin, Max (mb388a)1-0/+0
Project: so master 147e9ee814448c8bbec4aa3aeac4b7118b7c1bc7 validate number of uri keys test was setting unnecessary keys on uri changed plural to singular AAI class added in validation for number of keys provided Change-Id: I86f61301aa5f2ea676678908bae1e88b86d7e570 Issue-ID: SO-1409 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-22Updated git submodulesBenjamin, Max (mb388a)1-0/+0
Project: so master 5f72e4d0bb12e3291afac45a93d137b97006870f fixed incorrect object reference changed plural to singular AAI class Change-Id: I6205d95b881d011e377669858fc85dc2ff0a17f6 Issue-ID: SO-1412 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-22Updated git submodulesTony Hansen1-0/+0
Project: dcaegen2 master c38fcb02a120416eea225501fe4510ba2c5d27f1 Merge "Update dcae doc for 3.0.1" Update dcae doc for 3.0.1 Change-Id: I3d34323a0d802bc469ff6d8173fd1170584fd652 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-1105 (cherry picked from commit 68cd5213788fac134dcb6a3e53598121bfbf1208)
2019-01-22Updated git submodulesInstrumental1-0/+0
Project: aaf/authz master 12414fe43077e12d7ef711951b1633ad31d73573 Public and Private Locate entries Issue-ID: AAF-723 Change-Id: I9dcd2e732ce64b39aaa57a6e9404f275f7ad540c Signed-off-by: Instrumental <jonathan.gathman@att.com>
2019-01-22Updated git submodulesPrakashH1-0/+0
Project: dcaegen2 master 1e19c1881574ada75d9c27463204ea1b9271007e Heartbeat Microservice User Documentation User Documentation for heartbeat Microservice Issue-ID: DCAEGEN2-280 Change-Id: I1fd627b5026fa850c866a364440ff316db409b5a Signed-off-by: PrakashH <pbhandar@techmahindra.com>
2019-01-22Updated git submodulesPrakashH1-0/+0
Project: dcaegen2 master 3bcb00f79c6bacc5c1ed3c3c2fd7642992707f23 Heartbeat Microservice User Documentation User Documentation for heartbeat Microservice Issue-ID: DCAEGEN2-280 Change-Id: I158680b11b5d5de4a0d58f4d2f03816e2b1941fc Signed-off-by: PrakashH <pbhandar@techmahindra.com>
2019-01-22Updated git submodulesJoss Armstrong1-0/+0
Project: appc master 27543757355a584901f8d2cb5ca0b2dffe31a628 Coverage for appc-artifact-handler package Increased coverage from 0% to 95% Issue-ID: APPC-1335 Change-Id: I3c2e1f22009c47cda983e61eda7e98c48564ee98 Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>
2019-01-22Updated git submodulesSteve Smokowski1-0/+0
Project: so master 303b11fd56f09afea5ae125ee0bdc69c6ceac141 Merge "Either log or rethrow this exception." Either log or rethrow this exception. Location:DistributionClientEmulator.java Change-Id: I38b1b3fed9db0d24a6045352127e48b98cce6b63 Issue-ID: SO-1397 Signed-off-by: Shubhada Ramkrishna Vaze <SV00449682@TechMahindra.com>
2019-01-22Updated git submodulesManzon, Inna (im453s)1-0/+0
Project: sdc/sdc-tosca master 8e4f8425e2a0bb7a9e6cadf48537bc93d4680e25 Fix NPE, add getters to IEntityDetails Change-Id: Ia150f003fade5a276d785b2be90a8d9f63ab9f4e Issue-ID: SDC-2057 Signed-off-by: Manzon, Inna (im453s) <im453s@intl.att.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master a5bcce655e339151445fbce2c129687e3bc8610a Merge "Sonar Fix: ConfigDAO.java" Sonar Fix: ConfigDAO.java Fixed sonar issues/code-smells across this file Issue-ID: AAF-721 Change-Id: I14862446a984d07eadc55f1f1ccf7a6d6b1e2a4c Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master 061beab89414fa7c855f6356a407e6ace36f438a Merge "Sonar fix: NS.java" Sonar fix: NS.java Fixed sonar issues/code-smells across this file Issue-ID: AAF-704 Change-Id: Ice035ce50a0dc2ebe024cbd91bf62e0e920d5d4c Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master db821a31efd79fa0f7b9a30b4d5550efdc1476bd Merge "Junit test file for FacadeImpl.java" Junit test file for FacadeImpl.java Junit test file for FacadeImpl.java Issue-ID: AAF-716 Change-Id: Ic9665fab2eb5b0cd8b021b90b4d65f99c34cda3f Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master b61ed0b72faf201e90704f9f0d42627c290c8d89 Merge "Junit test file for AbsCredBody.java" Junit test file for AbsCredBody.java Junit test file for AbsCredBody.java Issue-ID: AAF-715 Change-Id: Ib41e9479bce9223a218e132b11b2942fff6a06b9 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master f0306f11ef4146a17485c96f6770c74315305dee Merge "Removed unused imports" Removed unused imports Fixed sonar issues- removed unused imports Issue-ID: AAF-714 Change-Id: I3b9199087f7d004ce50b35cfec079ec9c6d109fb Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master ca4b57d66a602ac94eba93bd3ab9106406575882 Merge "Sonar fix: History.java" Sonar fix: History.java Fixed sonar issues/code-smells across this file Issue-ID: AAF-712 Change-Id: Ife683e67f876a97d3a394be7742351a9aa6b945e Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master 4d121bbc162183ef65eab5ad273dac2265d43628 Merge "Sonar Fix: Grant.java" Sonar Fix: Grant.java Fixed sonar issues/code-smells across this file Issue-ID: AAF-713 Change-Id: I1eae70cac6ecbc3dc10e30396afa814be00c1ba8 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master 38eb0bfeeedc46e1d868e3cf1d06149e0fd130e5 Merge "Sonar Fix - Expiring.java" Sonar Fix - Expiring.java Expiring.java - Make this anonymous inner class a lambda Issue-ID: AAI-2062 Change-Id: I1d3418c09d16dca26df5a72db7fee1b839ba8a01 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesJonathan Gathman1-0/+0
Project: aaf/authz master 623526dd133a522db9f3b2bde29c0d8f67de4f68 Merge "Sonar Fix - Key.java" Sonar Fix - Key.java Sonar Fix - Key.java - Annotate the "Key" interface with the @FunctionalInterface annotation Issue-ID: AAF-710 Change-Id: I7a436e8823e0be0548294be1b59ac3cf7461c9ec Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-01-22Updated git submodulesPamela Dragosh1-0/+0
Project: policy/engine master a27af17fe8987c4da311e4419a31830d62592f91 Merge "Improved snar issues" Improved snar issues Change-Id: Iaaf16a8e7e30174509cfb40702185c9b2fc2961a Issue-ID: POLICY-1432 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2019-01-22Updated git submodulesburdziak1-0/+0
Project: policy/engine master 9790926957a4865ed731f6f1ff507508fba3e8ec Sonar issues improved Change-Id: I8b2ea531c1cfa6620a2240c3ae029c3c284f5cd7 Issue-ID: POLICY-1432 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2019-01-22Updated git submodulesshrikantawachar1-0/+0
Project: sdc master d139e09812ffbdb36a2058b514c51315c76b09f0 Allow custom plugins in SDC Allow custom plugins in SDC Change-Id: I09475a4f795734f7911e24652560f7d41ddb8d14 Issue-ID: SDC-2022 Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>
2019-01-22Updated git submodulesOren Kleks1-0/+0
Project: sdc master 5ea67deaa651bad97e0a9f90f7a6e0ef48e26665 Template-Interface file fix If there are no component instance in composition, the template interface file is not presented in import section Change-Id: Icd0682fbf5cfc539c3b6dd3d37558804d704348e Issue-ID: SDC-2055 Signed-off-by: shrek2000 <orenkle@amdocs.com>
2019-01-22Updated git submodulesArielk1-0/+0
Project: sdc master a868a311efee8710f29f89c9406903f9f9b7f392 Null x when adding operation to empty list Change-Id: Ib54f29049d8b576f48f8459439650c45fe1248f6 Issue-ID: SDC-2052 Signed-off-by: Arielk <Ariel.Kenan@amdocs.com>
2019-01-22Updated git submodulessiddharth09051-0/+0
Project: sdc master 7d8c592bdd302fe59fe12b134af941c2dd6ab058 Operation on PNF Operation on PNF Change-Id: I51448659eb5e730f42f30c6b5978809cfa1c9b6c Issue-ID: SDC-2054 Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
2019-01-21Updated git submodulesezhil1-0/+0
Project: appc master 1f28945a3c5d1a4ffc74edc815cf502d715e33ac Added Junit test file for RequestInfo.java Change-Id: I715d86976b1a328ce463701add3967a559ae1b7e Issue-ID: APPC-1320 Signed-off-by: ezhil <ezhrajam@in.ibm.com>
2019-01-21Updated git submodulesJoss Armstrong1-0/+0
Project: appc master 63b928252c2d5ef905f5e074fa8bbcfbf460d780 Correct unit tests for DBService class Increased test coverage from 74% to 92% in DBService class Issue-ID: APPC-1335 Change-Id: Iabd792eb104429d5090e0099dba463e8ad6d499a Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>
2019-01-21Updated git submodulesBalaji, Ramya (rb111y)1-0/+0
Project: appc master 0e9e5821fbd918fb9b33ad8ba5d311e7f527bcab Network Inventory Cient Platform Hardening Renamed class files to be more meaningful and synched up directories Issue-ID: APPC-1338 Change-Id: I5eee7c96013e8733fb14e4b0a1de88d4c9611a0f Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>
2019-01-21Updated git submodulesSteve Smokowski1-0/+0
Project: so master 244b9781a51c6172797f2ec8193399d1233778cc Merge "Bug fixes from AT&T January 20th" Bug fixes from AT&T January 20th sorted vfmodules by base last for negative action reqs store Response in execution as String on network delete added functionality to skip rollback based on flag # Conflicts: # bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflo w/tasks/WorkflowAction.java require XML in the header for delete network request Update APP-C LCM Client library version to 1.7.0. replaced wiremock style test with mockito test Handle AAIClient Exps in CreateCustomerV1 getServiceInstance() changed default status code to be configurable Replace vnfType by nfRole in the healthcheck request to SDNO. updated error messages in sdnc handler and flow status updated flow status message on completion of flow Send GenericVnf object for AAI VNF update for vnf-api updates Add a JUnit test file for SDNOValidatorImpl.java Set nodeType on the inner SDNO request as per update from SDNO. updated rollbackToAssigned logic to remove unassign flows updated sdnc handler error message for client error added exception handling for httpclienterror in sdnc out map workflow exception so error is reported throws sdnc error message on bad response from sdnc add catalog entries for TRANSPORT service delete flows change script number that was duplicate add find method to NorthBoundRequestRepository include serviceType in hash code use asterisk for all non-TRANSPORT flow db entries alacart true, rm not needed transport srvc model steps correct insert query syntax for orchestration_flow support serviceType (TRANSPORT) process flow fix SDNCAdapterException causing no callback to bpmn use JsonAlias for alternate case when deserializing GRM client will accept both "serviceEndPointList" and "ServiceEndPointList" root node in the JSON response. AAIRestClient now uses getSystemName in headers finishtime should not be returned in requeststatus Change-Id: I81a185252b057020f7f36f125c85c3357756da88 Issue-ID: SO-1403 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>