Merge branch 'EDGE-301' into EDGE-299
authorjaehoon.hyun <jaehoon.hyun@samsung.com>
Tue, 2 Apr 2019 06:57:16 +0000 (15:57 +0900)
committerjaehoon.hyun <jaehoon.hyun@samsung.com>
Tue, 2 Apr 2019 06:57:16 +0000 (15:57 +0900)
commit1ae9fdd6a03422624b9867a6bbf4dfdbdb8da1e4
treeef4566516cc74a0e1ca5cb1379331c6ba783b4c1
parent316636dac0558dd95e4ea637812c0fc1f7df7285
parentbc03f86bba4fd3e3e8e17b624c4bca54bb49fd18
Merge branch 'EDGE-301' into EDGE-299

# Conflicts:
# src/scoringmgr/handlers.go
# src/scoringmgr/mock/mock_lib_add.go
src/scoringmgr/handlers.go
src/scoringmgr/mock/mock_lib_add.go