22.11 release version 1.0.19 #383
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
* 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
* 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
* 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
* exclude fields on get list * remove useless method
* exclude fields on get list * remove useless method * update get method and swagger
* 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
…nse (#303) * EWC-297 EWC-298 fixed email activation, added user id to signup response * cleanup * cleanup * cleanup
* EWC-308 postman QA microservices * EWC-308 postman QA diagnostics
* fix cli image snapshot * fix
* fix cli image snapshot * fix * fix
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
logLimit -> logSize
* EWC-354 correct cli processing in update microservice * get microservice response was updated: + flowId + iofoguuid + catalogItemId
* correct cert reading from file in routes * correct options for connector's calls with selfi signed cert
log-limit -> log-size
* 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
dbusel
added a commit
that referenced
this pull request
Nov 24, 2018
* 22.11 release version 1.0.19 (#383) * EWC-359 `controller status` returns real status (online/offline) * Revert "EWC-359 `controller status` returns real status (online/offline)" * db migration calls before start instead of 'on starting' callback (#381) * connector cert fix (#382) * fixed production config & version 1.0.19 (#379) * build(packaging): change build configurations (#388) update package.json and travis.yml in order to automate npm package build and create github release * Update .travis.yml * fix detached head problem * Release 1.0.20 [skip ci]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.