2 Commits

Author	SHA1	Message	Date
Tom Pallister	5e1605882b	Feature/timeout for http client (#319) ... * #318 http client obeys Qos timeout or defaults to 90 seconds, which is think is default for http client anyway but zero docs.... * #318 updated docs to specify default timeout and make it clear how to set it on a ReRoute basis * #318 missed this * #318 missed this	2018-04-18 15:24:16 +01:00
Tom Pallister	aa55fe34cb	Feature/merge configuration files (#316) ... * #296 renamed configuration.json to ocelot.json in preparation * removed things we dont need for tests * another file we dont need * removed some async we dont need * refactoring to consolidate configuration code * removed another pointless abstraction * #296 started writing merge code * #296 coming up with ideas for this config merging * #296 still hacking this idea around * #296 will now do a crappy merge on the configuration * #296 change so tests pass on windows	2018-04-17 22:06:41 +01:00