Merge branch 'dev'

dsrodenas · dsrodenas · commit 4f130dcd00fe · 2017-04-07T17:20:35.000+02:00
diff --git a/test/Services/IntegrationTests/Services/Catalog/settings.json b/test/Services/IntegrationTests/Services/Catalog/settings.json
@@ -2,5 +2,6 @@
   "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
   "ExternalCatalogBaseUrl": "http://localhost:5101",
   "IdentityUrl": "http://localhost:5105",
-  "isTest": "true"
+  "isTest": "true",
+  "EventBusConnection": "localhost"
 }
diff --git a/test/Services/IntegrationTests/Services/Ordering/settings.json b/test/Services/IntegrationTests/Services/Ordering/settings.json
@@ -2,5 +2,6 @@
   "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
   "ExternalCatalogBaseUrl": "http://localhost:5101",
   "IdentityUrl": "http://localhost:5105",
-  "isTest": "true"
+  "isTest": "true",
+  "EventBusConnection": "localhost"
 }

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",`
`3`	`3`	`"ExternalCatalogBaseUrl": "http://localhost:5101",`
`4`	`4`	`"IdentityUrl": "http://localhost:5105",`
`5`		`- "isTest": "true"`
	`5`	`+ "isTest": "true",`
	`6`	`+ "EventBusConnection": "localhost"`
`6`	`7`	`}`