WIP: Merge vpp-v2 to master #199

Closed

osh.silva wants to merge 0 commits from osh.silva/device-mgt-core:vpp-v2 into master

osh.silva commented

Collaborator

There is no content yet.

osh.silva added 34 commits

9ccf3a5fa5 Add vpp user apis

fixes https://roadmap.entgra.net/issues/10162

9dd24eda17 Merge pull request 'Add vpp user apis' (#147 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #147

cc8470d3c0 add vpp user services

f246d6b8de Merge pull request 'add vpp user services' (#151 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #151

cd42a2c48f Adding the DAO layer for vpp user management

fixes https://roadmap.entgra.net/issues/10169

665702d504 Add asset apis

Fixes https://roadmap.entgra.net/issues/10178

2e799a545f Resolve comments

fa565eb1ea Merge pull request 'Adding the DAO layer for vpp user management' (#155 ) from osh.silva/device-mgt-core:vpp-user-dao-10169 into vpp-v2

Reviewed-on: #155

61ffd4abff Fixing conflics

caa9959dcd Merge pull request 'Add asset apis' (#156 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #156

54111b4d94 Add association apis

fixes https://roadmap.entgra.net/issues/10182

1263c09079 Add DAOs for asset management

fixes https://roadmap.entgra.net/issues/10179

a69218d436 Merge pull request 'Add association apis' (#161 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #161

c9ed09ee25 Resolve conflicts

949fbef41b Merge pull request 'Add DAOs for asset management' (#162 ) from osh.silva/device-mgt-core:asset-dao-10179 into vpp-v2

Reviewed-on: #162

026986cd93 Add DAO improvements for user APIs

Fixes https://roadmap.entgra.net/issues/10169

8507a88cad Merge pull request 'Add DAO improvements for user APIs' (#166 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #166

0e5478fb5e Add association DAO and fix meta issue

fixes https://roadmap.entgra.net/issues/10186

b978e31ab0 Resolve conflicts

fixes https://roadmap.entgra.net/issues/10186

dae8c09761 Resolve comments

81fd5687ef Update user service and token retrieval

b3a4649b64 Merge pull request 'Add DAO Layer for VPP Associate' (#168 ) from osh.silva/device-mgt-core:vpp-associate into vpp-v2

Reviewed-on: #168

eb740773aa Improve update asset DAO

fixes https://roadmap.entgra.net/issues/10179

fefc66bc59 Merge pull request 'Improve update asset DAO' (#174 ) from osh.silva/device-mgt-core:vpp-daos into vpp-v2

Reviewed-on: #174

01df370032 Add db scripts

2249520132 Resolve conflicts

cd17d06158 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

ec88734831 Merge pull request 'Add db scripts for VPP feature' (#179 ) from osh.silva/device-mgt-core:vpp-db-scripts into vpp-v2

Reviewed-on: #179

b576f3d9bb Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

dd7910268e Add vpp token field

32a289e10e Merge branch 'vpp-v2' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-token-change-10156

4b9cad1c75 Update db queries

8d552b3070 Merge pull request 'Add VPP token field' (#182 ) from osh.silva/device-mgt-core:vpp-token-change-10156 into vpp-v2

Reviewed-on: #182

a20c5a723c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

osh.silva added 1 commit

90a513590e Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

osh.silva closed this pull request

Please reopen this pull request to perform a merge.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: community/device-mgt-core#199