merged develop

This commit is contained in:
TomPallister
2017-02-11 12:07:08 +00:00
34 changed files with 674 additions and 295 deletions

View File

@ -39,8 +39,8 @@ namespace Ocelot.AcceptanceTests
DownstreamHost = "localhost",
UpstreamPathTemplate = "/",
UpstreamHttpMethod = "Get",
RequestIdKey = _steps.RequestIdKey
}
RequestIdKey = _steps.RequestIdKey,
}
}
};
@ -67,7 +67,7 @@ namespace Ocelot.AcceptanceTests
DownstreamHost = "localhost",
UpstreamPathTemplate = "/",
UpstreamHttpMethod = "Get",
RequestIdKey = _steps.RequestIdKey
}
}
};