summaryrefslogtreecommitdiffstats
path: root/catalog-model/src/main
AgeCommit message (Collapse)AuthorFilesLines
2017-09-14Merge "Fix - Blockstorage and Compute in VF linking"Michael Lando1-0/+14
2017-09-13Fix - Blockstorage and Compute in VF linkingTal Gitelman1-0/+14
Change-Id: I5b79be033ad547b4d3f4d5443bd2b3a74dff6242 Issue-ID:SDC-267 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
2017-09-13ComponentBaseTest.java enhancement andIdan Amit2-4/+54
new onboarding class that test onboarding only And merge release/1710 branch into master Change-Id: I300d897b151010aa26f8732518fa2e3b7ed4291b Issue-Id: SDC-331 Signed-off-by: Idan Amit <ia096e@intl.att.com>
2017-08-13[SDC-235] rebase codeMichael Lando1-5/+3
Change-Id: Iea503188e521fa3846f580ced7c1c4fce303abe5 Signed-off-by: Michael Lando <ml636r@att.com>
2017-08-10[SDC] code syncMichael Lando1-1/+16
Change-Id: Ia33a7874802b8ac2f49aed9199e109ea509e950e Signed-off-by: Michael Lando <ml636r@att.com>
2017-08-07[SDC] syncTal Gitelman43-24653/+77
Change-Id: I150c22c816c52cc142e8d0f3c92e5df7ecea4e3c Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
2017-08-07[SDC] code syncMichael Lando2-1/+2
Change-Id: I576dd69504722c341b0f41a1f6232ed3f4bee8df Signed-off-by: Michael Lando <ml636r@att.com>
2017-08-02[SDC] code rebase for sdc resync to LFAvi Ziv11-58/+271
Change-Id: If6d87c9e324f508a8a6b80b10a03d1843901472e Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-20[SDC] 1710 rebase + pom modificationsMichael Lando1-4/+6
Change-Id: I1f9c0a5201576c7a6b124f6a786db12c1a8cd7c0 Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-18[SDC] rebase 1710Michael Lando2-7/+31
Change-Id: I07fced02f40a57700d9d35ed3ba498bca351fb13 Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-17[SDC] rebase 1710 codeMichael Lando32-2269/+2578
Change-Id: I532ed68979fee7840ea8a5395e7e965b155fb9f9 Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-16Merge "[sdc] - merged 1707_build into sdc LF"Michael Lando6-140/+11
2017-07-16Simplify AbstractOperation methodsGary Wu3-44/+11
Change-Id: I58fa346425ab996ed7b9550bd8f21be679b08d0a Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-07-16[sdc] - merged 1707_build into sdc LFIdan Amit6-140/+11
Change-Id: Ia91f0206493d0cd8f158779ed1a94f55305c8a97 Signed-off-by: Idan Amit <ia096e@intl.att.com> Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-12[sdc] rebase updateMichael Lando31-6/+623
Change-Id: I8f1fc7150975122dd9f3f4e653b9983064b399a6 Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-03[sdc] - last merges before moving to LFTal Gitelman3-13/+9
Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
2017-06-29[SDC] rebase codeTal Gitelman6-54/+80
Change-Id: I456ec65a233d277e6bae35e140f2e3da5765bae6 Signed-off-by: Tal Gitelman <tg851x@intl.att.com> Signed-off-by: Michael Lando <ml636r@att.com>
2017-06-19[sdc] update to the current code baseMichael Lando4-62/+19
and support http Change-Id: I2fb35494b40126a8395b1e309a180db4127754b7 Signed-off-by: Michael Lando <ml636r@att.com>
2017-06-18[sdc] update code of sdcMichael Lando3-18/+58
Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a Signed-off-by: Michael Lando <ml636r@att.com>
2017-06-11[SDC-29] rebase continue work to align sourceMichael Lando35-1024/+1252
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando <ml636r@att.com>
2017-06-09[SDC-29] catalog 1707 rebase commit.Michael Lando140-5703/+20278
Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando <ml636r@att.com>
2017-02-19Initial OpenECOMP SDC commitMichael Lando215-0/+52071
Change-Id: I0924d5a6ae9cdc161ae17c68d3689a30d10f407b Signed-off-by: Michael Lando <ml636r@att.com>