summaryrefslogtreecommitdiffstats
path: root/docs/submodules/ccsdk/cds.git
AgeCommit message (Collapse)AuthorFilesLines
2019-09-17Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 44f56d241be4de6edf6b3ccda4e44426241581ed - Merge "Add missing parent" - Add missing parent Added missing parent tag to pom.xml to repair merge build. Change-Id: I88fdf616c953ae10634f755953e0119ad1a120d9 Issue-ID: CCSDK-1730 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-09-17Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to be1fecf35c4661f58ae91aad20cc1ad7a510da94 - Merge "Fix spring fox swagger snapshot version." - Fix spring fox swagger snapshot version. Change-Id: I62ce444d77fa0aa8d6d6adb3ceca0cc83040bbe9 Issue-ID: CCSDK-1724 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com> (cherry picked from commit 0597d0d0eb3ec6a84a11555383e7d019ba8f005c)
2019-09-16Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 4e089ab6271e00389ea2c4e995d785acf2046720 - Merge "add health-api project" - add health-api project Issue-ID: CCSDK-1669 Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com> Change-Id: I8a05db50e4f896ecc2e040a113d1fc676f139121
2019-09-16Update git submodulesSINGAL, KAPIL (ks220y)1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 8a5e40f28ee1cf4fbe4ace0fe81c95c1be35ac97 - Changing line separator type to LF Changed Line Separator for all files using find . -type f -not -name .* -exec dos2unix {} \; Issue-ID: CCSDK-1733 Signed-off-by: SINGAL, KAPIL (ks220y) <ks220y@att.com> Change-Id: I2efa3276c35c0a0159c6d4debe21c0bd0b4a7b85
2019-09-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 799f04c129b09d29ebd1b87092dea699a4174d11 - Merge "Blueprintprocessor Table change." - Blueprintprocessor Table change. Change-Id: I42942ce06a65e994b67e6611ad93167a56c8fd7b Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to bfe3e8331c2d30a12ef7d0ea2e2edda5832f85ad - Merge "Fix proto cyclic dependency." - Fix proto cyclic dependency. Change-Id: I84e0ba25b78e8212eff6b4c91fca2d4457dbf7eb Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to e0730ecac286c3d5b55b9a09d33be7674e6d317a - Merge "Implement GRPC download cab." - Implement GRPC download cab. Change-Id: I7c872b7e6e20590668c68b92ed221752a9413bd8 Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-16Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 3e93f01c621f80eac60d8d4cfc93ed136082c523 - Merge "Implement GRPC response payload" - Implement GRPC response payload Change-Id: I137cb9e2fa15c12f45a412d84e867f0613f15bf8 Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-16Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 85adf71c11bbdaeed1a9203eede8b7ac3107cb75 - Merge "CDS UI running guide" - CDS UI running guide Change-Id: I02d87ee86c0d959c64631fa8b3d21c685f461787 Issue-ID: CCSDK-1727 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-09-16Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 70873b2e418aab1a7b70ab5da8f0cac4f1c02388 - Merge "Properties mode for editor CBA creation" - Properties mode for editor CBA creation Change-Id: I6fa5d4456d733fa10d5b42ab887328691e4065e4 Issue-ID: CCSDK-1728 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-09-13Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to e7141675481392baaed182cb8e6a2a9b1abf8b9c - Merge "Add wrapper function for Cli and Netconf executor" - Add wrapper function for Cli and Netconf executor Issue-ID: CCSDK-1707 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I2c29d0135b8252cd21ed3d139516ac637c846927
2019-09-12Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 2419999ae7ab0bc8b555a955d5dfbc9eef9d6f3e - Merge "Ensure proper unloading of resources associated with the dynamic classloader for Kotlin scripts." - Ensure proper unloading of resources associated with the dynamic classloader for Kotlin scripts. Issue-ID: CCSDK-1692 Signed-off-by: Serge Simard <serge@agilitae.com> Change-Id: Ic1c1bf263331bf4a43d855798d2d62ec97503ceb
2019-09-12Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 6b8fbc694e204117efe3ae44c99ae08d64c11f9a - Merge "Added mode for kt and create method" - Added mode for kt and create method Change-Id: I4c1c20077a2da5269724fff12fc456a86b5168f4 Issue-ID: CCSDK-1275 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-09-11Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 8b24f42bcba5220f72b6977441867f774aca57df - Merge "Add source-rest mapping" - Add source-rest mapping Change-Id: I700a6fb6dbf97f87ea00460a1cf9f00948379128 Issue-ID: CCSDK-1623 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-09-11Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to a21724910b109cd07da051eb6d5ab5245ed40c19 - Merge "Implement GRPC enrich rpc." - Implement GRPC enrich rpc. Change-Id: I51d3b93a1a48677339e371a8cec7d2fd63811140 Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-11Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 594c530c5b2841ae3917c3c394d075bcb7d1286e - Merge "Move GRPC management api to designer api." - Move GRPC management api to designer api. Change-Id: I58ee303d361cf4f1996c966c094ec66886587b52 Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-11Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 1926b37d20ea4e63ac054dd10ca14001cecd7398 - Roll versions for Frankfurt development Roll master version for Frankfurt development Change-Id: Ife7ecc5bfb2d8d515805c40c381f6acb34af538b Issue-ID: CCSDK-1701 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-09-11Update git submodulesTimoney, Dan (dt5972)1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 4539cacfa8e45848c34419c2d96edf4375a30d86 - Release version 0.6.1 Release CCSDK version 0.6.1 Change-Id: I672526e55538206829ef257aaab2c6b7c1155196 Issue-ID: CCSDK-1701 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-09-10Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 85f7fb219f6e1f4227ac1463290f6a6aafc2b84f - Merge "Resource Dictionary: fecthing data-type list" - Resource Dictionary: fecthing data-type list Created loopback API function to fetch data-types from backend and display them in data-type drop-down Issue-ID: CCSDK-707 Change-Id: I797177b9042558c99a94df9c9dd4295c43389d29 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-09-10Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 98a00a5e3fac8b2ea7a23b8265fb5d70a8b9d35f - Merge "Revert "Use ProcessPool rather than ThreadPool Executor"" - Revert "Use ProcessPool rather than ThreadPool Executor" This reverts commit cd29a05ccd4279d7fb740d03bbeee6a0839b287e. Issue-ID: CCSDK-1681 Change-Id: I5827256ea5dc76b6ff8806250c684d155656dfc5 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-09-09Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to ea30ce882465f8e48e076fb5d057c9e07c6ec601 - Merge "HTTP headers feature for BP REST endpoints def'ns" - HTTP headers feature for BP REST endpoints def'ns Issue-ID: CCSDK-1341 Change-Id: I2da6a19ddea137c0fb868a413f77a45c1def3877 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
2019-09-07Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to a257847a16a8424a9612e14b4a2f09f3973c90ec - Merge "Fix errors in INFO.yaml" - Fix errors in INFO.yaml Fix errors in INFO.yaml file Issue-ID: CCSDK-1696 Change-Id: I796d30d30e9d4751b3a9fcfb99464d73b9d3633f Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-09-06Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to ff853257afc3ba42059fad2453f51674a61248d2 - Merge "Resource resolution fix + improvement." - Resource resolution fix + improvement. Fix: Fix for list typed data resolution retrieved from database table. Improvement: exposing occurrence property to template engine; useful, when doing multi-occurrence template generation, to index list data resolved previously. Issue-ID: CCSDK-1693 Signed-off-by: Serge Simard <serge@agilitae.com> Change-Id: I3a601ebabfcd42c439a515d3fe44ff4fc00b2314 Signed-off-by: Serge Simard <serge@agilitae.com>
2019-09-05Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 16dfa234954d54334f73b2a5c0ed3da47ff27c13 - Merge "Add Config based blueprint process consumer" - Add Config based blueprint process consumer Change-Id: I9e37ecb5032047f835f3b2ea20b2689c76353497 Issue-ID: CCSDK-1668 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-05Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to c656c611de770cb531199bf47c35cb41389fc100 - Merge "Add Kafka message lib consumer services" - Add Kafka message lib consumer services Change-Id: Iaf1df07a0d8f4fb54d5d06047520010d3bfe5465 Issue-ID: CCSDK-1668 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-05Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 25d4619d067d788c9c72bd96b52db92b8d7de6b4 - Merge "RR Complex types and Unit tests coverage" - RR Complex types and Unit tests coverage Issue-ID: CCSDK-1615 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I1035aa05b4b038095c9d17fdcd00c462bed5085a
2019-09-05Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 4427f5028b3807edf24c9c49addb4770a8fbb58e - Do not output StepData information This information is for internal processing purposes, it should not be output to user, as could cause confusion. Change-Id: I95ead3fbc5e22e3a1751e41d90e567965cc00fa4 Issue-ID: CCSDK-1691 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-09-05Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 1e85e4ee328b0d6aae39c6b7275a5fd949296b00 - Do not throw exception when no data exist. The first time we're doing a diff, if a store operation has never been done before, we shouldn't throw exception, we should silently succeed and set the diff as empty value. Change-Id: Ie2371737758a1525da6b76ac85bceb7fe1aa4673 Issue-ID: CCSDK-1690 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-09-05Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 23edb472bde9cf4fc119bc538dc51f5e16c9865f - Fix vFW CBA Change-Id: I3e45644a216daba1317d1052a054c3cbbb3a20be Issue-ID: CCSDK-1689 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 1a7d92d35a4fdadd162b2eece4a75c04037b9c7e - Merge "Add draft and publish grpc upload options." - Add draft and publish grpc upload options. Change-Id: Id1476f1cb449c4070a7ef53a918b62d26da26391 Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 9dda7df9046ec3c5b62de20f8b86a707f77677bd - Merge "Add support for cba enrich, publish, draft, remove" - Add support for cba enrich, publish, draft, remove Change-Id: If02e737e6103f0c51ad4371129f6ea1e7337ec98 Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 0bc235b587922bd8f4bcefbfc4a22fc3faba538e - Merge "CDS UI code changes" - CDS UI code changes Change-Id: Idca4f7e1e04853bd2118308dafa67fd2d7aee7d8 Issue-ID: CCSDK-1275 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 302ec11f5832bca25336febccedbc49490fc1106 - Merge "Do not duplicate model types and data dictionaries" - Do not duplicate model types and data dictionaries Change-Id: I960e9ce040490dea82bd9afa9133ed982fe08d14 Issue-ID: CCSDK-1663 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 82089df8930c27c3ef2dfa36e9b1a08e3e1d4fdd - Merge "Use ProcessPool rather than ThreadPool Executor" - Use ProcessPool rather than ThreadPool Executor Change-Id: I66a800bf30cabce35123b0ac24b3b3e00eef6026 Issue-ID: CCSDK-1681 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to e7bf7d75109cc3af5c15c36110c7831b4196f5ca - Merge "Combine Blueprint entities and repositories." - Combine Blueprint entities and repositories. Change-Id: I9e8672d6d0252dcf125e27060322ddd2b455aa39 Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 8b5f4c0583144f6984e1c4b5c8961d094488af8e - Merge "Remove controllerbluprints distribution." - Remove controllerbluprints distribution. Change-Id: I8c7269f97f2b32a0fe8689baaeddfe1e82e0d075 Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to b8fc5aab826138a3503d1cdd37d6f5eee63f08db - Merge "Refactor resource dictionary entity and repositories." - Refactor resource dictionary entity and repositories. Change-Id: I156d63df70d04e129e4a753cdc11e119ee97d37a Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to e0d9599425f68a331f3b2f7ee4b84a244aba5657 - Merge "Refactor handlers, services to designer api." - Refactor handlers, services to designer api. Change-Id: I3bc56e14fca332c0c0b661bb7e8a501a2dadbe91 Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to f2a6a305dc53624d598de6492deb8ff7869b2c00 - Merge "Refactor catalog service to blueprint processor." - Refactor catalog service to blueprint processor. Change-Id: Ia4bfc7c1b3ffb4020458f18deb71a2cf451ab65e Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to a006efcfacc3499615e835dae212c854826cfe7c - Merge "Refactor model entity and repository." - Refactor model entity and repository. Change-Id: I6f06fc46fcedbe1cbb8a8e6f8c30b131680a5b08 Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to e736a5b6d322b9046656d86002e12f509acfad9a - Merge "Refactor model types load to designer api." - Refactor model types load to designer api. Change-Id: Icc75c2cac2b9522fc20aa2247aafa8a1f494758e Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 2dec58df63642b89066cc01f938dd79fc2bbdb00 - Merge "Refactor enhancer service to designer api." - Refactor enhancer service to designer api. Change-Id: I63aa56c61f9b97826c2171479dd4d6f238c9d8da Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to e05e6edb98cf6661ffb5ddcb44249c9b0cc1eb38 - Merge "Refactor Blueprint model controller to designer api." - Refactor Blueprint model controller to designer api. Change-Id: I6e729aab24262f6bdef4b92febf9f65a4819d142 Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 2bce3cc416cae600e4d1f16fd39607e351ea5f05 - Merge "Resolve duplicate application property values" - Resolve duplicate application property values Change-Id: I0813ff96388bce77eba9fbc9eff0eccf59a6be6a Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to f2c49d190e77a36276a95a20bca44924fdb4031c - Merge "Search DB UI fix" - Search DB UI fix Stepper 2 search db UI height fix Change-Id: I8d247200b861b55aa873d083140fd40f43e27bd6 Issue-ID: CCSDK-1275 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 236e5bdf31a8d882708962318169a006d63ecf5d - Merge "Doc content format" - Doc content format Index file and user guide format Change-Id: I5e0de701d4c86d877286d7e6a16673129622c77b Issue-ID: CCSDK-1453 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-09-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 47138c6240e259c451fb353d3ced5c6f260b1b36 - Merge "Remove unused file and format content" - Remove unused file and format content Change-Id: I31cbb4aed1910964ba971ab84f9745d3675b5777 Issue-ID: CCSDK-1453 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-09-04Update git submodulesArundathi Patil1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 290d9a33e0fc1593307d1ca104fed41a189a9df7 - Fixed defect CCSDK-1680 Issue-ID: CCSDK-1680 Change-Id: Icf7564137d74ecf832d3df485ea68be1b35d2b83 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-08-29Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to b12d13b0b78b7e87912c07a7c946cbbfcee41d47 - Merge "Read only mode for CBA view" - Read only mode for CBA view Change-Id: I7fa0fddf14749499692931eeb86bba705de4819f Issue-ID: CCSDK-1275 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
2019-08-29Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 7a67ca2716ea5480961177b95b6ea09143351915 - Merge "Roll versions" - Roll versions Roll versions in master branch Change-Id: I12ac01bc8769303c9d6fe7053306bdaa68f54396 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>