Commit Graph
2 Commits
Author SHA1 Message Date
Sergey Borodachev 3f784d7949 Merge branch 'develop' into feature/config_grow_when_merged
# Conflicts:
#	src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs
#	test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs
2018-08-18 05:11:35 +04:00
Sergey Borodachev af3c39da6a Addressing issue #559 (Infinite configuration file growth when ASPNETCORE_ENVIRONMENT is defined)
Made IHostingEnvironment optional for AddOcelot() to avoid breaking change.
2018-08-18 04:29:21 +04:00