doc.git
5 years agoUpdate APIREF section 33/50733/1
Eric Debeau [Wed, 6 Jun 2018 16:30:32 +0000 (16:30 +0000)]
Update APIREF section

Issue-ID: DOC-275

Change-Id: I26bbd11c6f78f1c6691c29ae150ceccc2c5bf1c5
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
5 years agoMerge "Track beijing branch of modelspec" into beijing
Gregory Glover [Wed, 6 Jun 2018 16:00:21 +0000 (16:00 +0000)]
Merge "Track beijing branch of modelspec" into beijing

5 years agoMerge "Update naming of projet" into beijing
Eric Debeau [Wed, 6 Jun 2018 15:42:28 +0000 (15:42 +0000)]
Merge "Update naming of projet" into beijing

5 years agoTrack beijing branch of modelspec 21/50721/1
Rich Bennett [Wed, 6 Jun 2018 15:31:28 +0000 (11:31 -0400)]
Track beijing branch of modelspec

Change modelspec.git submodule reference to beijing branch

Change-Id: Ibe56f084d508faa74dac65e683f409509283a03d
Issue-ID: MODELING-79
Signed-off-by: Rich Bennett <rb2745@att.com>
5 years agoUpdated git submodules
Sai Gandham [Wed, 6 Jun 2018 12:46:04 +0000 (12:46 +0000)]
Updated git submodules

Project: integration beijing 0e0d76943af80fbe548ad2642b8a92d166d24235

Update aaf version in java manifest

Latest aaf version 2.1.1 artifacts are now released
into nexus and Update this version chnage in java
manifest.

Issue-ID: AAF-349
Change-Id: I7cb62377298caf366470bc6636e706892515a579
Signed-off-by: Sai Gandham <sg481n@att.com>
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoUpdated git submodules
Gary Wu [Wed, 6 Jun 2018 14:01:50 +0000 (14:01 +0000)]
Updated git submodules

Project: integration beijing 8caa3e82d2e42735135e44b08b690d01182c6b76

Merge "update version for usecase-ui docker manifest" into beijing

update version for usecase-ui docker manifest

Change-Id: Ia719d92aa90bd7a2e82b82d8a1f348acc4640fd3
Issue-ID: USECASEUI-125
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
5 years agoUpdated git submodules
Gary Wu [Wed, 6 Jun 2018 14:01:40 +0000 (14:01 +0000)]
Updated git submodules

Project: integration beijing a0d69f9634916f93dbb06e156b147187131e0ba9

Merge "Remove VID asdcclient from manifest" into beijing

Remove VID asdcclient from manifest

Change-Id: If04db576143523002777d1b669ebcc53a1f3fb5d
Issue-ID: VID-242
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
5 years agoUpdated git submodules
Gary Wu [Wed, 6 Jun 2018 14:00:17 +0000 (14:00 +0000)]
Updated git submodules

Project: integration beijing ad8b3c85cdb63f1acd757c93dc53a1b02b7af02d

Merge "Update the docker manifest file and artifacts" into beijing

Update the docker manifest file and artifacts

This patch is to change into release versions.

Change-Id: I2d18cdb7af4a703a4fc51b394cf6300d0a505d97
Issue-ID: MULTICLOUD-241
Signed-off-by: Xinhui Li <lxinhui@vmware.com>
5 years agoUpdate naming of projet 81/50681/1
Eric Debeau [Wed, 6 Jun 2018 13:41:26 +0000 (13:41 +0000)]
Update naming of projet

Provide consistency in the naming of projects
Inlcudes change from https://gerrit.onap.org/r/#/c/50521/1

Issue-ID: DOC-269

Change-Id: I06f484c0c591b76326e0449f9a8f2d5778fe45da
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
5 years agoUpdated git submodules
Michael Lando [Wed, 6 Jun 2018 10:36:02 +0000 (13:36 +0300)]
Updated git submodules

Project: sdc beijing 7fbbb01c091682ebd218b95104ddb806c8a0c299

update documentation

update release notes

Change-Id: I6d618959873445133db3e2ff6b64ff7d0f4cd279
Issue-ID: SDC-1378
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Wed, 6 Jun 2018 08:25:54 +0000 (11:25 +0300)]
Updated git submodules

Project: sdc beijing 41f32d5b9ca3d8f0df650d0bc657d66da512124b

update documentation

update release notes

Change-Id: I407943b2194bb3fa3b01449ca61d4900b9d80783
Issue-ID: SDC-1378
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Lusheng Ji [Wed, 6 Jun 2018 02:19:16 +0000 (22:19 -0400)]
Updated git submodules

Project: integration beijing d66f63d14c8dc651d8a759d0ae126e3c9a9d171c

Remove docker tags for unreleased components

Issue-ID: DCAEGEN2-499
Change-Id: I89c382559ba2a8210011de836f33b7002599c4e2
Signed-off-by: Lusheng Ji <lji@research.att.com>
5 years agoUpdated git submodules
Gildas Lanilis [Wed, 6 Jun 2018 01:32:49 +0000 (18:32 -0700)]
Updated git submodules

Project: integration beijing 410327d0a3d4b8b5c489438aa325ce46db298ee2

Update version for aai-ers docker manifest

Update to version 1.1.0

Change-Id: Ia4a9e42ea7598c1151086a9a3b64c1d269700cfc
Issue-ID: INT-524
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
5 years agoUpdated git submodules
Helen Chen [Wed, 6 Jun 2018 00:50:34 +0000 (00:50 +0000)]
Updated git submodules

Project: integration beijing 790ef2b3b4aad73d9fb776b08aa15f5e40dcfcd4

Merge "Remove unnecessary docker image" into beijing

Remove unnecessary docker image

No need to declare modeling/javatocachecker, b/c the lib is embedded within VFC.

Change-Id: I07b305a279ae8cbf05fb7ee673e69f7994a48bf4
Issue-ID: INT-523
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
(cherry picked from commit 1b3973eee58165874acedce0fc7a429824a526e6)

5 years agoUpdated git submodules
Manoop Talasila [Wed, 6 Jun 2018 00:33:45 +0000 (20:33 -0400)]
Updated git submodules

Project: integration beijing 0c6874406fecdc0437ebac9af2d5c191190aaaa8

Update the Portal's docker version

Issue-ID: CIMAN-132
Change-Id: Ic1ad1b0f17fba19815a3f4b749c9aeaa12e539c8
Signed-off-by: Manoop Talasila <talasila@research.att.com>
5 years agoUpdated git submodules
Gary Wu [Tue, 5 Jun 2018 18:26:44 +0000 (11:26 -0700)]
Updated git submodules

Project: integration beijing 9b57d6f0945a40feec9570ea29f3da295d8af6a4

Increase to 11 k8s VMs for stability

Issue-ID: INT-381
Change-Id: I864cf1f80c2b54fca200cd7cdb5d97e17d6f4706
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoUpdate setting up ONAP 09/50509/1
Eric Debeau [Tue, 5 Jun 2018 23:28:10 +0000 (23:28 +0000)]
Update setting up ONAP

Correct bad links

Issue-ID: DOC-269

Change-Id: I80486cc9d64b6f55dffff2a61c0852f4d32458c3
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
5 years agoMerge "Update setting up ONAP" into beijing
Eric Debeau [Tue, 5 Jun 2018 23:22:01 +0000 (23:22 +0000)]
Merge "Update setting up ONAP" into beijing

5 years agoUpdate setting up ONAP 03/50503/1
Eric Debeau [Tue, 5 Jun 2018 22:45:51 +0000 (22:45 +0000)]
Update setting up ONAP

Update release note with links to setting up files
Update various setting up files

Issue-ID: DOC-269

Change-Id: I2149026bdf10c694904a5b95a990775d288b40c1
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
5 years agoUpdated git submodules
Sai Gandham [Tue, 5 Jun 2018 22:16:07 +0000 (22:16 +0000)]
Updated git submodules

Project: integration beijing fa290e17ced19e893b3f7cf8e070f459c3aeea07

remove aaf authz-service latest in manifest

removed authz-service:latest from manifest as the
new version of authz-service is already available
for Beijing

Issue-ID: AAF-349
Change-Id: I1866f2032e258338b510078d13b3b83c74486a7d
Signed-off-by: Sai Gandham <sg481n@att.com>
5 years agoUpdated git submodules
Sai Gandham [Tue, 5 Jun 2018 21:05:11 +0000 (21:05 +0000)]
Updated git submodules

Project: integration beijing 8f8f382ad43367e6edc8bbd6159fad8b31d1010d

Upadte aaf docker version in manifest

Updated to latest version 2.1.1

Issue-ID: AAF-349
Change-Id: Ic7bc3079fab77c51fc748b189a69757a0bc4e6fc
Signed-off-by: Sai Gandham <sg481n@att.com>
(cherry picked from commit b10fa919d49092f36be599541973a1cb64c10ee3)

5 years agoMerge "Fix broken image links in Doc" into beijing
Eric Debeau [Tue, 5 Jun 2018 21:33:04 +0000 (21:33 +0000)]
Merge "Fix broken image links in Doc" into beijing

5 years agoUpdated git submodules
Gary Wu [Tue, 5 Jun 2018 21:16:46 +0000 (21:16 +0000)]
Updated git submodules

Project: integration beijing 076730db5e2f9f277c91f57b782f5aab64329a0e

Merge "Update docker manifest for buscontroller" into beijing

Update docker manifest for buscontroller

Change-Id: I590bfdf1ac8f2e7cd667efa4c7f234d03ce73d9f
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Issue-ID: INT-520
(cherry picked from commit 2b086f88617a3c23302f4cab84fb7dc5b40bc5a8)

5 years agoUpdated git submodules
Jimmy Forsyth [Tue, 5 Jun 2018 21:07:47 +0000 (17:07 -0400)]
Updated git submodules

Project: integration beijing 95604de32a8855e041677b2adbe935e717d6d1de

Update to latest java versions

Issue-ID: AAI-1204
Change-Id: I94f382eec0224f1eedcb9b02161b7453128aae41
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
5 years agoFix broken image links in Doc 73/50473/1
Chris Donley [Tue, 5 Jun 2018 21:13:27 +0000 (14:13 -0700)]
Fix broken image links in Doc

Issue-ID: DOC-275

Change-Id: If1f020da6609aac16fe16c5fe36bb89c9bd52fa5
Signed-off-by: Chris Donley <christopher.donley@huawei.com>
5 years agoUpdated git submodules
Jimmy Forsyth [Tue, 5 Jun 2018 20:47:47 +0000 (16:47 -0400)]
Updated git submodules

Project: integration beijing 4c7d20e30fb2e5165b0d155c8d6de787662d467c

Update to latest versions

Issue-ID: AAI-1204
Change-Id: Ia0997861a1964bc61bb7234253bc565006a78cb8
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
5 years agoUpdated git submodules
Gary Wu [Tue, 5 Jun 2018 20:15:04 +0000 (20:15 +0000)]
Updated git submodules

Project: integration beijing bceee2e6a6aac08d6c8dc6e41d541c6067f41015

Merge "release artifacts bumped" into beijing

release artifacts bumped

Issue-ID: SO-601

Change-Id: I987157fa19bad382f50cbc2d8362325c3369a495
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
(cherry picked from commit c5c0385f555183bf6403a40f4af65d73fa412d65)

5 years agoUpdated git submodules
seshukm [Tue, 5 Jun 2018 19:03:15 +0000 (03:03 +0800)]
Updated git submodules

Project: integration beijing ab0d74bdbf42ec5e342acbcd4635afa8dc9b037b

update the docker manifest file

Issue-ID: SO-601

Change-Id: Ia2e67dd05f9563d26e39a3fb7fbaf1450e363a0f
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
(cherry picked from commit 2008dff861653a03dfe1deddf441e545b666c2d8)

5 years agoUpdated git submodules
Gary Wu [Tue, 5 Jun 2018 18:48:27 +0000 (11:48 -0700)]
Updated git submodules

Project: integration beijing eb501eaaddcad18fba1cd977d90831f486e5ec29

Update docker manifest for sniroemulator

Change-Id: I3f335694fc16adb7226a440b4d05dbfb2f4a4046
Issue-ID: INT-504
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoMerge "Change DMaaP, VNFSDK ref" into beijing
Jun (Nicolas) Hu [Tue, 5 Jun 2018 18:34:39 +0000 (18:34 +0000)]
Merge "Change DMaaP, VNFSDK ref" into beijing

5 years agoMerge "Merge ESR UI & ESR Server" into beijing
Jun (Nicolas) Hu [Tue, 5 Jun 2018 18:34:31 +0000 (18:34 +0000)]
Merge "Merge ESR UI & ESR Server" into beijing

5 years agoUpdated git submodules
Gildas Lanilis [Mon, 4 Jun 2018 17:57:50 +0000 (10:57 -0700)]
Updated git submodules

Project: sdnc/oam beijing 559686d34c601e31ce0f309740d9f1e1b342db13

Update format of security section

Change-Id: I2ebd32eeb3f8f758450b572e41a4ea8f99a356fe
Issue-ID: DOC-271
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
Fix for multi tunnelxconn

Issue-ID: INT-517
Change-Id: Ib8b3508f0b2fece22437b09b9ced328522dd1561
Signed-off-by: Brian Freeman <bf1936@att.com>
5 years agoUpdated git submodules
Timoney, Dan (dt5972) [Tue, 5 Jun 2018 14:07:35 +0000 (10:07 -0400)]
Updated git submodules

Project: ccsdk/distribution beijing 11f1ddeb04bc8589702144c237c09f9086005842

Update release notes

Update release notes with links to Jira for list of user stories
and bugs fixed.

Change-Id: I49937d6a590c6e6fa2e309b694058fe76d561364
Issue-ID: CCSDK-278
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
5 years agoUpdated git submodules
jmac [Tue, 5 Jun 2018 14:41:26 +0000 (14:41 +0000)]
Updated git submodules

Project: integration beijing a6e05c8c18624a1794abb1d3a3ab879a7a06bcfe

update sdnc adminportal to release version

Change-Id: Iae7263cdc5e0ac46b102cd4c82b586be1db43256
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: INT-519
(cherry picked from commit c7931b9fdcbb8686be89153b5079e09cc3cff11c)

5 years agoUpdated git submodules
yangyan [Tue, 5 Jun 2018 04:13:53 +0000 (12:13 +0800)]
Updated git submodules

Project: integration beijing 037a66db760c41f1032f08484d0211ea3b56e563

Update manifest for VF-C

Issue-ID: VFC-930
Change-Id: I836f7971f6bd20b156404f596c378ee7eede6368
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoUpdated git submodules
Gary Wu [Tue, 5 Jun 2018 14:20:18 +0000 (14:20 +0000)]
Updated git submodules

Project: integration beijing d53a3a7352e76fa0305f90fb28d3f9be224554bf

Merge "update version for optf" into beijing

update version for optf

Update the version for optf repositories to 1.1.1

Issue-ID: OPTFRA-253
Change-Id: Id76f9b69972a4acf446e934e1529919749f7072b
Signed-off-by: Shankar Narayanan <snarayanan@research.att.com>
(cherry picked from commit 4b38677c15d69c7da3541e520034f95acb45fc91)

5 years agoUpdated git submodules
Determe, Sebastien (sd378r) [Tue, 5 Jun 2018 07:57:22 +0000 (09:57 +0200)]
Updated git submodules

Project: integration beijing 05138733947f303232329aad34f64cb8f388942a

Update CLAMP

Update CLAMP to 2.0.2 to align on the release

Change-Id: Ifd9f1863e8b0ef1141ff54a1b956831876bc7ea2
Issue-ID: CLAMP-176
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
(cherry picked from commit ba804644c5e3987591aff25c1614c026b949d7e7)

5 years agoUpdated git submodules
Kanagaraj Manickam k00365106 [Wed, 16 May 2018 06:46:00 +0000 (12:16 +0530)]
Updated git submodules

Project: integration beijing 4413b604095a48636d7ee1fcc40ea8f99eee64f8

Update CLI java manifest versions

Cherry-picked from master
fe85d66264bd22bdbefb53274ac0403ea7e58571

Change-Id: I6ccc88cc0697f5f283d744c796daa3b13d240637
Issue-ID: CLI-114
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoUpdated git submodules
Huabing Zhao [Tue, 5 Jun 2018 07:22:54 +0000 (15:22 +0800)]
Updated git submodules

Project: integration beijing 28f22075bd90853962c5947baf9a65c1ab266ff2

Update manifest

Issue-ID: MSB-200
Change-Id: Id1617c796bb17a7aba6b4c29b0b5966bac4c3dc1
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
(cherry picked from commit 61f8eb477e7f8c9859dbeb0cbeebf49f0f1cd7df)

5 years agoUpdated git submodules
Michael Lando [Tue, 5 Jun 2018 08:19:32 +0000 (11:19 +0300)]
Updated git submodules

Project: integration beijing f2ff4725f48d0887b21d5f712258997af36e9907

update sdc artifacts

update docker versions and artifact versions for Beijing

Change-Id: Icc65263e80e47a7f698830891d293216ca807c80
Issue-ID: SDC-1397
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoMerge "Add blueprint enrichment to Docs" into beijing
Gregory Glover [Tue, 5 Jun 2018 12:54:27 +0000 (12:54 +0000)]
Merge "Add blueprint enrichment to Docs" into beijing

5 years agoMerge "Sort project name in release repo" into beijing
Gregory Glover [Tue, 5 Jun 2018 12:54:10 +0000 (12:54 +0000)]
Merge "Sort project name in release repo" into beijing

5 years agoUpdated git submodules
Michael Lando [Mon, 4 Jun 2018 22:47:39 +0000 (01:47 +0300)]
Updated git submodules

Project: sdc beijing e2268112ff8d8f482bfdde26457897eea0eb1039

update documentation

update general information
update swagger information
fix swagger erros

Change-Id: If8c426785162ea5b063aae6f893f708b86cf14b6
Issue-ID: SDC-1378
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Helen Chen [Mon, 4 Jun 2018 23:32:36 +0000 (23:32 +0000)]
Updated git submodules

Project: integration beijing 044d470b930ffc3873af134a8a9e0409c7a4825d

Merge "Add initial README for deployment directory" into beijing

Add initial README for deployment directory

Change-Id: I28d7edeb11fa191cd9da8e2cfa3c46805a0e7894
Issue-ID: INT-506
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoUpdated git submodules
Gary Wu [Mon, 4 Jun 2018 23:23:54 +0000 (16:23 -0700)]
Updated git submodules

Project: integration beijing 614331b0605ee176995f9037d7c161dd3c4a3d75

Add license header to deployment scripts

Change-Id: I5c14c553a5d702b625f69d361cbb2d22cb52cd5a
Issue-ID: INT-504
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoUpdated git submodules
Helen Chen [Mon, 4 Jun 2018 23:03:57 +0000 (23:03 +0000)]
Updated git submodules

Project: integration beijing d2121aa240d8465f384524c73e69bcf2f8b7817f

Merge "Set override to enable SDNC clustering" into beijing

Set override to enable SDNC clustering

Also disable log pods in all Wind River SB environments
to avoid VM crashing issue.

Change-Id: Ide0667961cd84678ceff43d53298600fde68080c
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
5 years agoSort project name in release repo 49/50249/4
Gildas Lanilis [Mon, 4 Jun 2018 21:50:54 +0000 (14:50 -0700)]
Sort project name in release repo

Issue-ID: DOC-271
Change-Id: Iad3bbbc2cefca8c9848ae87444dc8b4f5b99a183
Issue-ID: DOC-271
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
5 years agoAdd blueprint enrichment to Docs 61/50261/1
Chris Donley [Mon, 4 Jun 2018 22:29:55 +0000 (15:29 -0700)]
Add blueprint enrichment to Docs

Issue-ID: DOC-275

Change-Id: Ieb72ee07ab99e0bb869d0f7d2f16d6a06d4cb623
Signed-off-by: Chris Donley <christopher.donley@huawei.com>
5 years agoUpdated git submodules
Dileep Ranganathan [Mon, 4 Jun 2018 12:14:38 +0000 (05:14 -0700)]
Updated git submodules

Project: optf/has beijing 9f27e4f3c2518c3f8df7f8653d89b4912f205b31

Fix OOF configuration

Added missing multicloud section in conductor.conf
Updated music version to reflect the latest version

Change-Id: I7e943c4344c63d4e18df9f00f6b61600e97295a7
Issue-ID: OPTFRA-232
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
5 years agoUpdated git submodules
Gary Wu [Mon, 4 Jun 2018 21:56:57 +0000 (21:56 +0000)]
Updated git submodules

Project: integration beijing 60307ecad5a5f59009d77413b706efc9f26a2012

Merge "Update appc versions" into beijing

Update appc versions

Update java and docker versions.
Change appc to org.onap naming.

Change-Id: I49c914b1db0da67bbdb9ef2dd8437da8aa1af00a
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-967

5 years agoMerge "Clean RST file" into beijing
Eric Debeau [Mon, 4 Jun 2018 21:54:30 +0000 (21:54 +0000)]
Merge "Clean RST file" into beijing

5 years agoUpdated git submodules
Eric Debeau [Mon, 4 Jun 2018 21:21:49 +0000 (21:21 +0000)]
Updated git submodules

Project: integration beijing a59c75d12f8f9260ed87fc0f65ee72d0de82a2cb

Update manifest file

Update exernalapi/nbi to 2.0.0

Change-Id: I27e37448d0a5194b379b2696578f12168a4384ca
Issue-ID: EXTAPI-103
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
(cherry picked from commit ef3bbee746e6901f136badd8a8c012129ba3cc75)

5 years agoClean RST file 45/50245/1
Eric Debeau [Mon, 4 Jun 2018 20:52:51 +0000 (20:52 +0000)]
Clean RST file

Correct DOC8 errors

Change-Id: Ic40f9c2ddf1788424cae2ae383e17cba30e30773
Issue-ID: DOC-275
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
(cherry picked from commit b49dc8b69027915f23ed626ede3d057c8a7cbd7c)

5 years agoChange DMaaP, VNFSDK ref 43/50243/1
Katel34 [Mon, 4 Jun 2018 21:31:30 +0000 (23:31 +0200)]
Change DMaaP, VNFSDK ref

Change-Id: Ic1c6bad72ba38c556b12b8ddef55fdbc4144e411
Signed-off-by: Katel34 <cl664y@att.com>
Issue-ID: DOC-273

5 years agoMerge ESR UI & ESR Server 37/50237/1
Katel34 [Mon, 4 Jun 2018 21:10:58 +0000 (23:10 +0200)]
Merge ESR UI & ESR Server

Change-Id: Idccff9b28facee06fb662b0e44c944b58300def3
Signed-off-by: Katel34 <cl664y@att.com>
Issue-ID: DOC-273

5 years agoMerge "Fix reference issues (VNFSDK, Models, DMaaP)" into beijing
Gregory Glover [Mon, 4 Jun 2018 20:56:01 +0000 (20:56 +0000)]
Merge "Fix reference issues (VNFSDK, Models, DMaaP)" into beijing

5 years agoFix reference issues (VNFSDK, Models, DMaaP) 25/50225/1
Katel34 [Mon, 4 Jun 2018 20:44:00 +0000 (22:44 +0200)]
Fix reference issues (VNFSDK, Models, DMaaP)

Change-Id: Ia182db51c574706d08def1509186231fdd67a837
Signed-off-by: Katel34 <cl664y@att.com>
Issue-ID: DOC-273

5 years agoUpdate DOC arch section for Beijing 03/50203/1
Chris Donley [Mon, 4 Jun 2018 17:02:25 +0000 (10:02 -0700)]
Update DOC arch section for Beijing

Issue-ID: DOC-275

Change-Id: I5d0ac386de0692ce39f5b2f9f156d7553f494a3a
Signed-off-by: Chris Donley <christopher.donley@huawei.com>
(cherry picked from commit 4539c941f3118636dc884eb79634ee324458eb71)

5 years agoMerge "Add references of missing components" into beijing
Gregory Glover [Mon, 4 Jun 2018 19:58:55 +0000 (19:58 +0000)]
Merge "Add references of missing components" into beijing

5 years agoAdd references of missing components 99/50199/1
Katel34 [Mon, 4 Jun 2018 19:34:30 +0000 (21:34 +0200)]
Add references of missing components

Change-Id: Ic1f849a268b0b9086986e0a76d793f4aa27cc384
Signed-off-by: Katel34 <cl664y@att.com>
Issue-ID: DOC-273

5 years agoUpdated git submodules
Timoney, Dan (dt5972) [Mon, 4 Jun 2018 17:53:35 +0000 (13:53 -0400)]
Updated git submodules

Project: integration beijing 857966881f67cd2f5b321ef8e5f8b474313a02f7

Update manifests for CCSDK, SDNC

Update manifests to final version for CCSDK (0.2.4) and SDNC (1.3.4)

Change-Id: If9e5a134ce6dbd7f1ce16560780b50dc0c5f504b
Issue-ID: CCSDK-291
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
(cherry picked from commit 38364c642c4a0ff07857128ddbb70010e4547935)

5 years agoUpdated git submodules
Ankitkumar Patel [Mon, 4 Jun 2018 19:28:03 +0000 (19:28 +0000)]
Updated git submodules

Project: optf/osdf beijing f1b6e7f225e344a6be2f3c5ea3a809209c6d342e

Merge "Fix indentation" into beijing

Fix indentation

Issue-ID: DOC-271
Change-Id: Idb13ec049b74c503d024ad762daafd14a9b5d0f8
Signed-off-by: Shankar Narayanan <snarayanan@research.att.com>
(cherry picked from commit 9a7f7627126af0db557517d0c02b01e37d757416)

5 years agoUpdated git submodules
Patel, Ankitkumar [Fri, 1 Jun 2018 18:43:29 +0000 (14:43 -0400)]
Updated git submodules

Project: optf/has beijing b226ac1dff4c4a0d8e72aafdf343a19f41aad3ea

Updated the version of the HAS image

Updated the version of the HAS image.

Issue-ID: OPTFRA-251
Change-Id: I489610fc85591d16c29cc604adc4584c61c13da8
Signed-off-by: Patel, Ankitkumar <ankit@research.att.com>
(cherry picked from commit b257e44786d799bacb4aa03421cf241c77374990)

5 years agoUpdated git submodules
Patel, Ankitkumar [Fri, 1 Jun 2018 18:38:50 +0000 (14:38 -0400)]
Updated git submodules

Project: optf/osdf beijing 6e6bcf3160c4351c6abc2a1be0fd28fd53645fe5

updated the version of an image

Updated the version of an image.

Issue-ID: OPTFRA-251
Change-Id: I2fdf0789ebad30f4e520b55890317e2404546c07
Signed-off-by: Patel, Ankitkumar <ankit@research.att.com>
(cherry picked from commit 59af1ba116cc0e834f2c1a0d9ac2b523682016b9)

5 years agoUpdated git submodules
Patel, Ankitkumar [Mon, 4 Jun 2018 15:46:06 +0000 (11:46 -0400)]
Updated git submodules

Project: optf/osdf beijing ee360937cf1b67f6d63dc0d8a8fdeecd31adb613

Document Security section of the Release Notes

Document Security section of the Release Notes

Issue-ID: DOC-271
Change-Id: Ieb8afe9c3ddf5788552bcbb2be5fc5da8629d5f4
Signed-off-by: Patel, Ankitkumar <ankit@research.att.com>
(cherry picked from commit 3754b77ba9301b0f43714bf45b46c627349c90ea)

5 years agoMerge "Add the reference to the Use Case UI" into beijing
Eric Debeau [Mon, 4 Jun 2018 16:25:43 +0000 (16:25 +0000)]
Merge "Add the reference to the Use Case UI" into beijing

5 years agoAdd the reference to the Use Case UI 37/50137/1
Katel34 [Mon, 4 Jun 2018 16:05:11 +0000 (18:05 +0200)]
Add the reference to the Use Case UI

Change-Id: I6f562caf04083dd754efd3ef93dd86c1ffe04f30
Signed-off-by: Katel34 <cl664y@att.com>
Issue-ID: DOC-273

5 years agoMerge "Update modeling specs in references.rst" into beijing
Gregory Glover [Mon, 4 Jun 2018 16:02:57 +0000 (16:02 +0000)]
Merge "Update modeling specs in references.rst" into beijing

5 years agoUpdate modeling specs in references.rst 27/50127/1
Victor Gao [Sat, 2 Jun 2018 07:30:50 +0000 (15:30 +0800)]
Update modeling specs in references.rst

Change-Id: Ia736f2910693e973c9d9c05947a3961d31f177bd
Issue-ID: MODELING-79
Signed-off-by: Victor Gao <victor.gao@huawei.com>
(cherry picked from commit 2e8d9626930c5c00fcc47b1e87192ba8606457f9)

5 years agoRemove the other section from the references 25/50125/1
Katel34 [Mon, 4 Jun 2018 12:07:21 +0000 (14:07 +0200)]
Remove the other section from the references

Change-Id: I19d42879ba432634a62f280d8dabeb779af4ca20
Signed-off-by: Katel34 <cl664y@att.com>
Issue-ID: DOC-273
(cherry picked from commit 692b58ad9644b7f0df8e67fb2d7ea91c456f05c0)

5 years agoUpdated git submodules
Gildas Lanilis [Sat, 2 Jun 2018 05:18:46 +0000 (22:18 -0700)]
Updated git submodules

Project: integration beijing b9898b31b0582f3e5e7d79f267a0d5c5037d001f

Update Manifest for Holmes

Update Docker and Java manifest to version 1.1.0

Change-Id: I410efeba141b66f47da603317fc7395f4cfa6a14
Issue-ID: HOLMES-132
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
(cherry picked from commit 5447f044d3aec4462cdffa4b1868c3c63097994e)

5 years agoMerge "Master Beijing Release Note" into beijing
Gregory Glover [Mon, 4 Jun 2018 13:14:05 +0000 (13:14 +0000)]
Merge "Master Beijing Release Note" into beijing

5 years agoUpdated git submodules
fsandoval [Thu, 31 May 2018 03:03:54 +0000 (21:03 -0600)]
Updated git submodules

Project: optf/has beijing 5edc1cfae3fb0b7568b75ae650200fc4775e8318

add security issues

Issue-ID: OPTFRA-242

Change-Id: I99441f4d41388f3a0e1837f5a8bd019e2ff2d260
Signed-off-by: fsandoval <frank.sandoval@oamtechnologies.com>
(cherry picked from commit c8d14fbe6c762581737c95ede15e9b9919bee788)

5 years agoUpdated git submodules
Patrick Brady [Sun, 3 Jun 2018 19:49:52 +0000 (12:49 -0700)]
Updated git submodules

Project: appc/deployment beijing 3f4def33eda1d8797e679caf1dcfa63bfa7c3c7d

Change to release ver of cdt proxy

Change-Id: I1949b6475c225f6f6ddc5a325ed8ea84c4d654d5
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-961

5 years agoUpdated git submodules
Michael Lando [Sun, 3 Jun 2018 15:06:57 +0000 (18:06 +0300)]
Updated git submodules

Project: sdc/sdc-docker-base beijing 18cba5cee4111729ab145b0b4c5f741e44b026d8

Fix additional library CVEs

Change-Id: I82aa5c334f365e6ebaf65d88abb79beb96472ef4
Issue-ID: SDC-1310
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 18:35:48 +0000 (21:35 +0300)]
Updated git submodules

Project: sdc beijing 76be68d39688617e46ab5dba1b5865ed4cb85b69

tine out configuration not used

Change-Id: I55c81975cd40b81510b18865e32e2f5394718349
Issue-ID: SDC-1344
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 16:14:05 +0000 (19:14 +0300)]
Updated git submodules

Project: sdc beijing 0a3c4290cc8d29ac42413994a05c438ff06edd6f

add delay for csit

add sleep 30s between cassndra startup and the init exacution.

Change-Id: Icc32d18d23982030ea8a0009c47a1e3c288f8884
Issue-ID: SDC-1344
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 13:53:14 +0000 (16:53 +0300)]
Updated git submodules

Project: sdc beijing 08f993452e5c8a61d05784165a91c791f73615fd

Drop down being cut in plugin view

Fixed drop down being cut down in plugin view

Change-Id: I51104e640cb2873884f4f2048aa765c53feb5830
Issue-ID: SDC-1367
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 13:52:35 +0000 (16:52 +0300)]
Updated git submodules

Project: sdc beijing bdff70b07f5db50a444c49dfbce6bd0d7980e060

new unit tests for sdc-dao

Change-Id: Ica0a4a0f2ca2ea0a14b97634292c4c82a63d0be6
Issue-ID: SDC-1333
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 13:51:58 +0000 (16:51 +0300)]
Updated git submodules

Project: sdc beijing ba80ce511c209a672b3514dc0263ffadff4152ca

Fix SDC DCAE configuration

Fix SDC DCAE configuration

Change-Id: I763e362e8405b3939b0893759d8991071331394c
Issue-ID: SDC-1390
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 13:51:08 +0000 (16:51 +0300)]
Updated git submodules

Project: sdc beijing 96d2a02c0950b6f91f4334163333b46a93b05e5f

new unit tests for sdc-dao

Change-Id: Ie19279acdd0f656f3b9aeb5a82935c98051ee472
Issue-ID: SDC-1333
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 13:50:20 +0000 (16:50 +0300)]
Updated git submodules

Project: sdc beijing d582d5ef41bdfd035de7834ea275fb8593ee3308

new unit tests for sdc-dao

Change-Id: I5957837664a933169704c3041f9ba979f97ae1f6
Issue-ID: SDC-1333
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Sat, 2 Jun 2018 13:15:17 +0000 (16:15 +0300)]
Updated git submodules

Project: sdc beijing 2c5e9a802d40dff290b2a7acd0db103617034038

new unit tests for sdc-dao

Change-Id: Ib5560760fe81fc0213dfca84f5be32362b41f6fe
Issue-ID: SDC-1333
Signed-off-by: Michael Lando <ml636r@att.com>
5 years agoUpdated git submodules
Michael Lando [Tue, 29 May 2018 21:29:50 +0000 (00:29 +0300)]
Updated git submodules

Project: sdc beijing a05044b3b3b91ac21d0728401c3c2f91e1bc7632

add drived from statement to datatypes

fix issue where some data types did not have the derived from

add derive from root to all missing once.

Change-Id: I432fbd96da300adebf66c4dfac5af0804be1859c
Issue-ID: SDC-1297
Signed-off-by: Michael Lando <ml636r@att.com>
(cherry picked from commit 3b2267ad7c5cbbebfe1137ce27afd05bf82bb6ff)

5 years agoMaster Beijing Release Note 67/49967/5
Gildas Lanilis [Fri, 1 Jun 2018 18:27:15 +0000 (11:27 -0700)]
Master Beijing Release Note

-update Summary and Functionality sections
-update section headers
Change-Id: If19f72e69ee5884f94dffa41ba341b2649e5c0d5
Issue-ID: DOC-271
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
5 years agoFix SDC submodule 05/50005/1
Jessica Wagantall [Sat, 2 Jun 2018 01:16:37 +0000 (18:16 -0700)]
Fix SDC submodule

Looks like the beijing branch was removed from
SDC repo and hence caused all doc verify jobs to
fail. Restoring this submodule to a reachable
commit.

This was the failure reported:
Unable to checkout
'a7c4d61a0f948780cbb7998217474a14c9c2dccd'
in submodule path 'docs/submodules/sdc.git'

Issue-ID: DOC-271
Change-Id: I57e3c06373b369f142aba7096b1455870fd59828
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
5 years agoUpdated git submodules
hector [Sat, 2 Jun 2018 00:00:43 +0000 (20:00 -0400)]
Updated git submodules

Project: integration beijing 0280abe12beffd87373e4ea5aabd1ac0cf75a4f9

Enable kubectl auto-completion

Issue-ID: INT-518
Change-Id: Ib7544018d73a1861a86b2ab07780b463f7ec704a
Signed-off-by: Hector Anapan <ha076r@att.com>
(cherry picked from commit 56bc0dd1790f10b42396f9b8c15f804071bd2ff5)

5 years agoUpdated git submodules
Idan Amit [Thu, 31 May 2018 12:45:03 +0000 (15:45 +0300)]
Updated git submodules

Project: sdc beijing a7c4d61a0f948780cbb7998217474a14c9c2dccd

Drop down being cut in plugin view

Fixed drop down being cut down in plugin view

Change-Id: I8d5895231e1e921c0c07df563a61039f207f253c
Issue-ID: SDC-1367
Signed-off-by: Idan Amit <ia096e@intl.att.com>
(cherry picked from commit 751ed40ff09744eb535e70164787ca826cfb6acf)

5 years agoUpdated git submodules
Areli, Fuss (af732p) [Thu, 31 May 2018 08:27:18 +0000 (11:27 +0300)]
Updated git submodules

Project: sdc beijing 8a58deb7a2eb68f92cb8e8fee428248a07332021

Fix SDC DCAE configuration

Fix SDC DCAE configuration

Change-Id: I3edc9da4c57a71caffe0a03cfbaeb70222ac343f
Issue-ID: SDC-1390
Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>
(cherry picked from commit 7dfc6dab26087e9d91b4026efe475d50dde63657)

5 years agoUpdated git submodules
Tal Gitelman [Wed, 30 May 2018 13:15:52 +0000 (16:15 +0300)]
Updated git submodules

Project: sdc beijing c79c4ff6e8aadc830889c72a3f17607fae33b424

new unit tests for sdc-dao

Change-Id: I2ec09504aee1ab315dbc8e1d02ac85ed76e24c9b
Issue-ID: SDC-1333
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
(cherry picked from commit 4b93ef990cd41e9728b1059295a331e27c307df1)

5 years agoUpdated git submodules
Tal Gitelman [Wed, 30 May 2018 12:25:07 +0000 (15:25 +0300)]
Updated git submodules

Project: sdc beijing cc497e2ba900e96264b3f88a527d1cf5eac43579

new unit tests for sdc-dao

Change-Id: I00ac8b1bd58fd952b7c23d402ce71436658403b8
Issue-ID: SDC-1333
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
(cherry picked from commit e7c6fa0d421e0e9df5c848ff2b6fc61c1b71871b)

5 years agoUpdated git submodules
Shankaranarayanan Puzhavakath Narayanan [Fri, 1 Jun 2018 19:40:05 +0000 (19:40 +0000)]
Updated git submodules

Project: optf/has beijing e5a42227941aa22ebc0eb576dc2cca66585deebd

Merge "update has docs" into beijing

update has docs

Issue-ID: OPTFRA-242

Change-Id: I9d89ef313018c3a0c25c48a4e0cecabba75db2fd
Signed-off-by: fsandoval <frank.sandoval@oamtechnologies.com>
(cherry picked from commit 84ad836b25024835dc3abbb42832dfd36bcb23ce)

5 years agoUpdated git submodules
fsandoval [Thu, 31 May 2018 15:36:45 +0000 (09:36 -0600)]
Updated git submodules

Project: optf/has beijing 1c89312dc29505f7a5881d7462fb59306c7602fc

moved docs to has/docs

Issue-ID: OPTFRA-242

Change-Id: Ib46a96f5d7281084cb8c859b4bbe56265b8ccdba
Signed-off-by: fsandoval <frank.sandoval@oamtechnologies.com>
(cherry picked from commit 40db765dbfa3f18d59f08e84a49f08aa58b66ca0)

5 years agoUpdated git submodules
Scott Seabolt [Fri, 1 Jun 2018 17:04:08 +0000 (13:04 -0400)]
Updated git submodules

Project: appc beijing 1668bde5de39d011310ae67572ed80a92c31e07b

Cumulative Release Notes

Issue-ID: APPC-358
Change-Id: I1ee522bf9e6c13221854f887d92e104518819e62
Signed-off-by: Scott Seabolt <js9808@att.com>
(cherry picked from commit 6d59a74cf17f0025ef3ff5e7a8e97f2c54d75480)

5 years agoMerge "Sync DOC beijing to submodule beijing branches" into beijing
Gregory Glover [Fri, 1 Jun 2018 17:43:32 +0000 (17:43 +0000)]
Merge "Sync DOC beijing to submodule beijing branches" into beijing

5 years agoUpdated git submodules
Scott Seabolt [Fri, 1 Jun 2018 14:06:09 +0000 (10:06 -0400)]
Updated git submodules

Project: appc beijing 202596e321641552457dbb05c62a7620f6a8dc2e

Update Release Notes
Removing NexusIQ Rreport

Issue-ID: APPC-358
Change-Id: Ia6b09c6b2c9647c6dbb58f27c58abc9962da0b1d
Signed-off-by: Scott Seabolt <js9808@att.com>
(cherry picked from commit d57fe180e66823a38b4d0cd73025bb129cd44d0b)

5 years agoSync DOC beijing to submodule beijing branches 57/49957/1
Rich Bennett [Fri, 1 Jun 2018 16:52:33 +0000 (12:52 -0400)]
Sync DOC beijing to submodule beijing branches

Change-Id: I94b2c3bc8d4302e5f2298df0088b1f3f2f7fa7f5
Issue-ID: DOC-270
Signed-off-by: Rich Bennett <rb2745@att.com>
5 years agoUpdated git submodules
Scott Seabolt [Fri, 1 Jun 2018 13:12:20 +0000 (09:12 -0400)]
Updated git submodules

Project: appc beijing 0d33ddfc61ccc109603677c09fc166cfca91779a

Updated Release Notes

Issue-ID: APPC-358
Change-Id: If77812deae4e318403a51e5139a29748d51371b1
Signed-off-by: Scott Seabolt <js9808@att.com>
(cherry picked from commit 3f0c9ee880bb46aa53eba9033ebb7ccd5596cdf0)

Document Security section of the Release Notes

Update with latest wording
Change-Id: I50dc9d708a7d020a21c31742091a486f1433a349
Issue-ID: DOC-271
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
(cherry picked from commit 2948985766b4542d43f9f117bd2fc6cc4ca58a56)

Update APPC LCM Guide

Issue-ID: APPC-936
Change-Id: Ie894550f6d8dc36ce958d3cbee3bce94a053b526
Signed-off-by: Scott Seabolt <js9808@att.com>
(cherry picked from commit 0d70bb654b35823b47c98fd45c006ee263598b6f)

Refactor properties used for topic names

Change-Id: Ifc7e5c0c57f64a237c2314ba7a60dabb92e067f1
Signed-off-by: Ryan Young <ry303t@att.com>
Issue-ID: APPC-934
(cherry picked from commit 38280dcce5a2d489c3e016d531faf043dbaddb41)

Client to use controller type for DMaaP partition

Update client library to use the controller type to set the DMaaP
cambria.partition

Change-Id: I7e3206309d99ba599d7d6785e63a76ec7c948896
Signed-off-by: Ryan Young <ry303t@att.com>
Issue-ID: APPC-934
(cherry picked from commit 61f4c8ce5e093db0b63d4030cbd3e6df499854a1)

Corrected config params validations

Issue-ID: APPC-932
Change-Id: Ie4166c7e5079c67d112d6e17b5dcd1f0ceaefacc
Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>
(cherry picked from commit 2f76aaa31d09cd691636650e13f36ecdb17e1df4)

Change to new ccsdk version

Ccsdk 1.0.3 version of parent poms was released.

Change-Id: Iea7d4144c57b6a953d99a210ed655429bff5b629
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: CCSDK-290
(cherry picked from commit 8afc602a135a4ad03f4877f94f5962d05ae37046)

Update Release Notes Format

cherry-pick from master

Issue-ID: APPC-358
Change-Id: Ie091260a881cd8fd54cbf694167878076eb4a3ee
Signed-off-by: Scott Seabolt <js9808@att.com>
(cherry picked from commit 6339a234dabcc929ac95d42373a0a425e0d972cd)

Healthcheck bug fixes

Fixed code to set userid and
password correctly. Also set the url
in context when passed in reference
artifact.

Cherry-pick from master branch

Issue-ID: APPC-917
Change-Id: Iba5a873cc311ab5677b6223c08865c048dbdcf00
Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>
(cherry picked from commit 17e3dbc0a2af683609c5d8cebdcc68884a29b1aa)

5 years agoResync Beijing Branch submodules 45/49945/1
Rich Bennett [Fri, 1 Jun 2018 15:46:48 +0000 (11:46 -0400)]
Resync Beijing Branch submodules

Synchronize submodules with current head of master branch

Change-Id: Iaacdeb75f785a041337ce28bc28657c58bf01315
Issue-ID: DOC-270
Signed-off-by: Rich Bennett <rb2745@att.com>
5 years agoUpdated git submodules
Gary Wu [Thu, 31 May 2018 22:40:53 +0000 (22:40 +0000)]
Updated git submodules

Project: integration beijing c533c4bb56148b708a935f60a5ee3aeaea840a0a

Merge "Upversion manifests for new gizmo release" into beijing

Upversion manifests for new gizmo release

Issue-ID: AAI-1189
Change-Id: Ic0b64c9a081ead0f30593029df4fdbc92d8442c5
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
(cherry picked from commit 589d4fb2f8f3c7bfcf47579a062663fcdd57507b)