aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-conflict-lib
AgeCommit message (Collapse)AuthorFilesLines
2018-07-29re base codeMichael Lando3-32/+8
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando <ml636r@att.com>
2018-06-18Revert "SonarQube coverage"ayalaben2-7/+0
Change-Id: I6b1ab87272fdd23f185e3b79f276cd583fd35884 Issue-ID: SDC-1364 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
2018-06-02update sdc versionMichael Lando3-3/+3
update pom and version.properties to 1.3.0 Issue-ID: SDC-1370 Change-Id: I0dcf02f868dd263ba4523435e7be11bdc3851053 Signed-off-by: Michael Lando <ml636r@att.com>
2018-05-27SonarQube coverageayalaben2-0/+7
Change-Id: I2290ea6462cb2ab7a9a3a9feba69b69231ec78fa Issue-ID: SDC-1364 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
2018-05-27Revert "update sdc version"Michael Lando3-3/+3
This reverts commit 5920d2c9e47958ed5f3197b7a16094e01e8d4bcd. Change-Id: I7906549d1fb7ba5d8d081870a9d976a3c8077438 Issue-ID: SDC-1370 Signed-off-by: Michael Lando <ml636r@att.com>
2018-05-26update sdc versionMichael Lando3-3/+3
update pom and version.properties to 1.3.0 Issue-ID: SDC-1370 Change-Id: Ib8f4e2859ee79dfd8e19e725b07c77d7d2bbdaf1 Signed-off-by: Michael Lando <ml636r@att.com>
2018-03-05Delete VSP merge Hint - fix sonar issuesayalaben1-14/+7
Change-Id: I7e8d3efd9db3ec714ab97d740cc71e826713b467 Issue-ID: SDC-1014 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
2018-02-18Onboarding foundation changes for ItemManagersheetalm1-6/+21
Resolved conflicting changes 1. Split ItemManager to ASDCItemManager and ItemManager 2. ItemManager provides basic capability of item without collaboration 3. AsdcItemManager provides all capabilities of item including collaboration which are required by onboarding 4. ItemManager can be used by other services like activity spec to create a basic item without collaboration features. Change-Id: I6c6dc34a2b1a1745c796099b70e359432e90f85e Issue-ID: SDC-1039 Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
2017-12-21Add collaboration featuretalig18-0/+837
Issue-ID: SDC-767 Change-Id: I14fb4c1f54086ed03a56a7ff7fab9ecd40381795 Signed-off-by: talig <talig@amdocs.com>