dbusel
released this
14 Dec 18:16
release package merge (#373)
* Epankou/feature microservice cli (#294)
* microservice validation refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* cli microservice wip
* cli microservice wip
* microservices cli wip
* cli microservices final
* microservice cli refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Epankou/feature microservice cli (#296)
* microservice validation refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* cli microservice wip
* cli microservice wip
* microservices cli wip
* cli microservices final
* microservice cli refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* removed column need_update from microservices
* Epankou/feature microservice cli (#297)
* microservice validation refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* cli microservice wip
* cli microservice wip
* microservices cli wip
* cli microservices final
* microservice cli refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* removed column need_update from microservices
* removed column need_update from microservices
* Update README.md (#298)
* EWC-279 error messages refactoring (#299)
* Epankou/bug flow deactivation ewc 293 (#301)
* microservice validation refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into new-fog-controller
# Conflicts:
# src/services/microservices-service.js
* cli microservice wip
* cli microservice wip
* microservices cli wip
* cli microservices final
* microservice cli refactoring
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/decorators/transaction-decorator.js
# src/helpers/error-messages.js
# src/services/microservices-service.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'new-fog-controller' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-microservice-cli
# Conflicts:
# src/cli/microservice.js
* removed column need_update from microservices
* removed column need_update from microservices
* EWC-293 flow deactivation
* EWC-293 flow deactivation
* EWC-293 flow deactivation
* Dbusel/bug ewc 301 Flow get list (#302)
* exclude fields on get list
* remove useless method
* Dbusel/bug ewc 301 flow get (#304)
* exclude fields on get list
* remove useless method
* update get method and swagger
* Dbusel/bug ewc 304 Microservice get (#305)
* exclude fields on get list
* remove useless method
* remove fields on microservice get
* update swagger docs
* update methods connected to get
* refactoring after pr comments
* add user check for flow name duplicate (#307)
* EWC-297 EWC-298 fixed email activation, added user id to signup response (#303)
* EWC-297 EWC-298 fixed email activation, added user id to signup response
* cleanup
* cleanup
* cleanup
* EWC-303 fixed microservice create validation & duplicate name for different users (#306)
* EWC-298 new registry bug (#308)
* fixed CLI config email activation update (#309)
* Update .travis.yml
* Running migrations and seeders programmatically (#300) (#311)
* Running migrations and seeders programmatically
* missing travis script command
* v1.0.0 and NODE_ENV processing fix (#295)
* user endpoints fixes (#310)
* EWC-311 postman QA collections for user, controller, agent + some code fixes (#313)
* EWC-313 postman QA flow section (#314)
* EWC-312 postman QA catalog (#315)
* EWC-316 postman QA tunnel (#316)
* EWC-308 postman QA microservices (#318)
* EWC-308 postman QA microservices
* EWC-308 postman QA diagnostics
* postinstall script deleted (#319)
* EWC-310 postman QA iofog (#321)
* EWC-317 postman QA registry (#322)
* fix cli image snapshot (#323)
* fix cli image snapshot
* fix
* cert in connector cli fix (#320)
* get fog list params in query (#324)
* small fix snapshot in windows os (#325)
* fix cli image snapshot
* fix
* fix
* fixed image snapshot endpoint in postman qa collection (#326)
* EWC-300 registry patch endpoint & some fixes (#327)
* Epankou/feature microservice removal ewc 306 (#312)
* EWC-306 microservice removal
* EWC-306 microservice removal
* EWC-306 microservice removal
* EWC-306 microservice removal
* EWC-306 microservice removal
* EWC-306 microservice removal
* change tracking refactoring and renaming ewc 262 (#317)
* renaming and refactoring
ChangeTrackingService was added
containerConfig -> microserviceConfig
containerLIst -> microserviceList
* cleanup
* get fog list params in query
* EWC-322 config cli log messages (#330)
* EWC-322 config cli log messages
* EWC-322 config cli log messages
* EWC-321 lastActive agent decorator (#329)
* EWC-321 lastActive agent decorator
* cleanup
* EWC-331 restrict uuid field in iofog create endpoint (#331)
* migration from v1.0.0 to umzug ewc 327 (#328)
* get fog list params in query
* preisntall and postinstal scripts
* merge cleanup
* vars to /tmp folder
correct comparison of versions
* postman collection (#332)
* EWC-330 fixed redundant timestamp fields in response (#334)
* rename endpoints (#333)
* Rename updatedBy/createdBy field to userId (#335)
* rename updatedBy to userId
* rename updatedBy to userId
* resolve pr comments
* remove duplicates
* EWC-338 fixed email activation field in config CLI (#337)
* small fix (#338)
* transaction validation in decorator (#336)
* get fog list params in query
* transaction validation
* updated postman collection for microservice update endpoint (#339)
* Ashpak/bug change content type for save image (#341)
* small fix
* fix
* Epankou/feature volume mapping ewc 332 (#340)
* volume mapping & delete with clean up
* volume mapping & delete with clean up
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Epankou/bug cli config messages (#342)
* volume mapping & delete with clean up
* volume mapping & delete with clean up
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* CLI fixes EWC 340 (#344)
* EWC-340 CLI fixes
* cleanup
* fix file size, rename (#345)
* fix file size, rename
* update
* Epankou/bug swagger fix & connector cli fix (#343)
* volume mapping & delete with clean up
* volume mapping & delete with clean up
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Connector CLI validation EWC 343 (#347)
* EWC-343 fixed connector domain/ip validation
* cleanup
* Epankou/bug non dev mode connector ewc 339 (#346)
* volume mapping & delete with clean up
* volume mapping & delete with clean up
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* connector non dev mode fix EWC-339
* Epankou/bug microservice removal ewc 306 (#348)
* volume mapping & delete with clean up
* volume mapping & delete with clean up
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* connector non dev mode fix EWC-339
* microservice removal cli bug fix
* fix return empty json (#349)
* fixed migration constaints (#351)
* fixed migrations constaints (#352)
* fixed migration constaints
* cleanup
* feature transactions ewc 337 (#353)
* get fog list params in query
* fake transaction on agent routes
cleanup change tracking only if not empty
sequelize sync on start was deleted
* cleanup
* postman fix
* bug portmapping and routes api fixes (#354)
* get fog list params in query
* [post /port-mapping] [post /routes] response code 201 -> 204
[get /port-mapping-list] -> [get /port-mapping]
* cleanup:
[post /port-mapping] response code 204 -> 201, because has response
* cli iofog help improvement ewc 342 (#355)
* get fog list params in query
* iofog version commands list in help
* EWC-340 additional CLI validation (parameters per 1 command) (#356)
* EWC-340 additional CLI validation (parameters per 1 command)
* delete with cleanup microservice fix
* validation for full-name parameters
* redundant lib querystring was deleted. qs used instead (#357)
* EWC-347 fixed user activate/suspend handling (#358)
* EWC-347 fixed user activate/suspend handling
* cleanup
* fArgs.length check in transaction decorator (#359)
* fix swagger response list (#360)
* WIP: EWC-344 automated packaging (#350)
* Create pu.sh
* Update .travis.yml
* add notifications
* Update .travis.yml
* Update .gitignore
* Update .travis.yml
* chore: dev version 1.0.1
* Update package.json
* Update package-lock.json
* chore: dev version 1.0.14
* Update .travis.yml
* bluetooth and microservice creation on fog update fix: (#362)
if trying to update fog from cli then userId for bluetooth or hal microservices got from oldFog data instead of user obj? which doesn't exists in cli call
* correct delete and create routes on update iofognode field of microservice (#361)
* EWC-351 type of catalog-id and flow-id in microservice cli was changed (#364)
string -> number
* todo in iofog-service was done (#363)
* user preparation in microservice cli (#366)
* EWC-353 renaming in microservice cli: (#365)
logLimit -> logSize
* Update README.md (#367)
* Maksimchepelev/bug cli microservice update ewc 354 (#368)
* EWC-354 correct cli processing in update microservice
* get microservice response was updated:
+ flowId
+ iofoguuid
+ catalogItemId
* Update .gitignore
* chore: dev version 1.0.15
* EWC-352 self signed cert fixes: (#369)
* correct cert reading from file in routes
* correct options for connector's calls with selfi signed cert
* EWC-353 renaming in microservice cli help: (#370)
log-limit -> log-size
* restoring old db on update controller (#371)
* remove auto version increment
* Epankou/bug catalog item images cli (#372)
* volume mapping & delete with clean up
* volume mapping & delete with clean up
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332
# Conflicts:
# src/cli/microservice.js
# src/controllers/microservices-controller.js
# src/services/microservices-service.js
* connector non dev mode fix EWC-339
* microservice removal cli bug fix
* catalog item creation fix
* Update package.json