4 Commits

Author	SHA1	Message	Date
Varorbc	a5bb74a2ea	Update tracing.rst (#509)	2018-07-30 07:49:11 +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
Tom Pallister	9f1fb002c1	Feature/#246 (#252) ... * failing test * failing test but needs real butterfly server running..need to fix that...also worked out ive broken tracing...yey * brought in butterfly source code so i can work out how to write acceptance tests for this... * fixed the bug but still need to fix tracing * tracing working again across services but need to make tracing hook into new Ocelot middleware as it still uses asp.net middleware * removed butterfly libs brought in for testing	2018-03-01 12:58:36 +00:00
Tom Pallister	947a1450d0	updated docs for tracing	2018-02-13 14:23:23 +00:00