Christian Arenas 06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev ...

# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs

2017-07-07 11:56:57 +02:00

..

Extensions

Add idempotent for the client header in tests

2017-03-24 15:21:17 +01:00

Middleware

Created Marketing read data model

2017-06-13 17:31:37 +02:00

Services

Merge branch 'feature/marketing-details-azure-function' into dev

2017-07-07 11:56:57 +02:00

appsettings.json

Add functional test for integration events. Implement IDisposable for EventBusRabbitMQ.

2017-03-17 15:57:57 +01:00

FunctionalTests.csproj

Add functional test: Check The user has an location campaign

2017-06-14 15:12:40 +02:00