Commit ed87d6d
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 fix1 parent e92cab5 commit ed87d6d
1 file changed
+4
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
| 265 | + | |
| 266 | + | |
270 | 267 | | |
271 | 268 | | |
272 | 269 | | |
| |||
275 | 272 | | |
276 | 273 | | |
277 | 274 | | |
278 | | - | |
279 | | - | |
| 275 | + | |
| 276 | + | |
280 | 277 | | |
281 | 278 | | |
282 | 279 | | |
| |||
0 commit comments