2 Commits

Author	SHA1	Message	Date
ddrsql	91103a4a01	Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev ... # Conflicts: # eShopOnContainers-ServicesAndWebApps.sln # k8s/deployments.yaml # k8s/gen-k8s-env-aks.ps1 # k8s/internalurls.yaml # k8s/ocelot/configuration-web-shopping.json # src/ApiGateways/ApiGw-Base/Program.cs # src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json # src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json # src/Services/Identity/Identity.API/Configuration/Config.cs # src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs # src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs # src/Web/WebMVC/AppSettings.cs # src/Web/WebMVC/Startup.cs # src/Web/WebSPA/AppSettings.cs # src/Web/WebSPA/Client/modules/shared/models/configuration.model.ts # src/Web/WebSPA/Client/modules/shared/services/configuration.service.ts # src/Web/WebSPA/Client/modules/shared/services/security.service.ts	2018-05-24 18:02:28 +08:00
Cesar De la Torre Llorente	2d2323b109	Improved deploy.ps1 to Push not Push images to Registry	2018-05-18 13:03:31 -07:00