Commit Graph

  • 4520268303 Made tests less brittle Marcin Grzejszczak 2017-11-22 10:30:01 +01:00
  • 345cfc8b50 Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-22 10:17:51 +01:00
  • 82cff6e9e9 Merge branch '1.2.x' Marcin Grzejszczak 2017-11-22 10:17:39 +01:00
  • 2d53a38c14 Wrapping the feign object in a different way Marcin Grzejszczak 2017-11-22 10:07:40 +01:00
  • 18392ddc23 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-22 02:58:47 +00:00
  • 9600a63d11 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-22 01:50:17 +00:00
  • 3e07d41f45 Sync docs from master to gh-pages buildmaster 2017-11-22 01:20:27 +00:00
  • 8a93262cb4 Fixed a test Marcin Grzejszczak 2017-11-21 20:12:37 +01:00
  • 7cd1e56c03 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-21 19:07:39 +00:00
  • 63118c79cb Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-21 19:56:59 +01:00
  • 183ea3b8cf Revert "Updates to zipkin version fixing encoding bug" Marcin Grzejszczak 2017-11-21 19:37:07 +01:00
  • 68709c7843 Trying to fix the build Marcin Grzejszczak 2017-11-21 19:35:17 +01:00
  • 31ebbf5ccb Fixed wrong versions Marcin Grzejszczak 2017-11-21 19:26:28 +01:00
  • b4ecb6f957 Ensure we're not tracing the traced feign clients Marcin Grzejszczak 2017-11-21 19:07:06 +01:00
  • dfc5ae57bb Updates to zipkin version fixing encoding bug Adrian Cole 2017-11-10 15:21:21 +08:00
  • 8e9fa7125c Ensure we're not tracing the traced feign clients Marcin Grzejszczak 2017-11-21 19:07:06 +01:00
  • db0dc632a6 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-21 02:58:40 +00:00
  • 8efb248ed8 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-21 01:50:20 +00:00
  • 01677d5e6b Sync docs from master to gh-pages buildmaster 2017-11-21 01:20:27 +00:00
  • edd8754a6a Sync docs from master to gh-pages buildmaster 2017-11-20 22:07:53 +00:00
  • b60ff42fc8 Made ZIpkin 2 default Marcin Grzejszczak 2017-11-20 23:06:13 +01:00
  • 36df047abc Sync docs from 2.0.x to gh-pages buildmaster 2017-11-20 04:50:20 +00:00
  • 684f627ed4 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-20 02:58:35 +00:00
  • 9fd2f69361 Sync docs from master to gh-pages buildmaster 2017-11-20 01:20:44 +00:00
  • 1921268713 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-19 02:58:38 +00:00
  • 5a92b36102 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-19 01:50:20 +00:00
  • 5537d59b43 Sync docs from master to gh-pages buildmaster 2017-11-19 01:20:32 +00:00
  • 06b4d687b8 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-18 02:58:36 +00:00
  • e87c3e3042 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-18 01:50:23 +00:00
  • 52e3b704ae Sync docs from master to gh-pages buildmaster 2017-11-18 01:20:33 +00:00
  • a44bb54354 Continuation of async spans (#784) Marcin Grzejszczak 2017-11-17 12:35:59 +01:00
  • dd17b70ec7 Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-17 12:02:22 +01:00
  • 2ecd77d151 Fighting flakey tests Marcin Grzejszczak 2017-11-17 12:02:05 +01:00
  • 8ba607c7a4 Trying to limit flakey tests Marcin Grzejszczak 2017-11-17 11:35:48 +01:00
  • 9e50a9f955 Removed autoconfiguration exclusion Marcin Grzejszczak 2017-11-16 13:04:12 +01:00
  • 700c429c20 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-17 02:58:38 +00:00
  • f7722aa942 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-17 01:50:21 +00:00
  • e67cd5808b Sync docs from master to gh-pages buildmaster 2017-11-17 01:20:31 +00:00
  • a438e382d6 Going back to snapshots buildmaster 2017-11-16 19:54:06 +00:00
  • 87a7d13119 Update SNAPSHOT to 2.0.0.M4 buildmaster 2017-11-16 19:52:57 +00:00
  • 66f5ab6701 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-16 02:58:48 +00:00
  • 8c0d7494d2 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-16 01:50:19 +00:00
  • 513da1c63e Sync docs from master to gh-pages buildmaster 2017-11-16 01:20:33 +00:00
  • f63d37e39c Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-15 17:40:45 +01:00
  • 85517c6670 Increased timeouts Marcin Grzejszczak 2017-11-15 17:40:36 +01:00
  • 12715b9d23 Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-15 17:18:48 +01:00
  • 1ab3870d43 Modified a test to present better output Marcin Grzejszczak 2017-11-15 17:18:00 +01:00
  • afc8e0c7b2 Sync docs from 2.0.x to gh-pages buildmaster 2017-11-15 16:14:30 +00:00
  • ab2ccf2562 Updated docs Marcin Grzejszczak 2017-11-15 15:36:30 +01:00
  • 573013b5ea Sync docs from master to gh-pages buildmaster 2017-11-15 14:33:01 +00:00
  • a4dbfbee5f MAde tests pass, fixed webclient support Marcin Grzejszczak 2017-11-15 11:51:24 +01:00
  • ace815fd7e Sync docs from 1.2.x to gh-pages buildmaster 2017-11-15 02:58:36 +00:00
  • 4718dd3c9f Sync docs from 2.0.x to gh-pages buildmaster 2017-11-15 01:50:25 +00:00
  • 8fa9344ab0 Sync docs from master to gh-pages buildmaster 2017-11-15 01:20:31 +00:00
  • 7d93667dfa Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-14 18:03:09 +01:00
  • 08b5d04133 Removed @EnableAsync from configuration; fixes #780 Marcin Grzejszczak 2017-11-14 18:03:03 +01:00
  • 8b16089445 Added debug info for messaging tests Marcin Grzejszczak 2017-11-14 17:20:26 +01:00
  • 20639bdd38 Skipping an assertion in tests Marcin Grzejszczak 2017-11-14 16:22:57 +01:00
  • f29349d7ee Added WebClient.Builder support; fixes #779 Marcin Grzejszczak 2017-11-14 15:57:52 +01:00
  • 163051a1f1 Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-14 15:22:44 +01:00
  • e2c11b592c Added RestTemplateBuilder support Marcin Grzejszczak 2017-11-14 14:57:27 +01:00
  • 8c7870d214 Fixed broken tests Marcin Grzejszczak 2017-11-14 14:06:57 +01:00
  • e6bf63307c Fixed not compiling code Marcin Grzejszczak 2017-11-14 12:19:15 +01:00
  • 740d4adf4d Sync docs from 2.0.x to gh-pages buildmaster 2017-11-14 13:02:48 +00:00
  • 360f7ed187 Removed type target from New/ContinueSpan; fixes #772 Marcin Grzejszczak 2017-11-14 11:32:16 +01:00
  • aaf8515479 JavaDoc fix to match implementation (#776) Tommy Ludwig 2017-11-14 19:27:53 +09:00
  • d7895519dd Removed type target from New/ContinueSpan; fixes #772 Marcin Grzejszczak 2017-11-14 11:32:16 +01:00
  • 37f0a46cc6 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-14 02:58:36 +00:00
  • f27a551086 Sync docs from master to gh-pages buildmaster 2017-11-14 01:20:41 +00:00
  • 3bb718f750 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-13 02:58:33 +00:00
  • d2b2031440 Sync docs from master to gh-pages buildmaster 2017-11-13 01:20:33 +00:00
  • adc5059273 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-12 02:58:35 +00:00
  • db60e39b1a Sync docs from master to gh-pages buildmaster 2017-11-12 01:20:31 +00:00
  • 8417f6188d Sync docs from 1.2.x to gh-pages buildmaster 2017-11-11 02:58:33 +00:00
  • ea929b692a Sync docs from master to gh-pages buildmaster 2017-11-11 01:20:31 +00:00
  • 92e434e261 Updates to zipkin version fixing encoding bug Adrian Cole 2017-11-10 15:21:21 +08:00
  • bd98537297 Updates to zipkin version fixing encoding bug Adrian Cole 2017-11-10 15:21:21 +08:00
  • c72bb22cf9 Updates to zipkin version fixing encoding bug Adrian Cole 2017-11-10 15:21:21 +08:00
  • e5750e714c Sync docs from 1.2.x to gh-pages buildmaster 2017-11-10 02:58:37 +00:00
  • 21b560755b Sync docs from master to gh-pages buildmaster 2017-11-10 01:20:35 +00:00
  • a4db694136 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-09 02:58:42 +00:00
  • ed65b95de2 Sync docs from master to gh-pages buildmaster 2017-11-09 01:20:41 +00:00
  • 76d18369a0 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-08 02:58:43 +00:00
  • efe423f35d Sync docs from master to gh-pages buildmaster 2017-11-08 01:20:41 +00:00
  • 8dedb47ce8 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-07 02:58:45 +00:00
  • b09b5970ea Sync docs from master to gh-pages buildmaster 2017-11-07 01:20:48 +00:00
  • a5e1396150 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-06 02:58:41 +00:00
  • 6328ed90ff Sync docs from master to gh-pages buildmaster 2017-11-06 01:20:52 +00:00
  • 9b5908c947 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-05 02:58:39 +00:00
  • 192ffeddda Sync docs from master to gh-pages buildmaster 2017-11-05 01:20:38 +00:00
  • 2630a9bf75 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-04 02:58:36 +00:00
  • 45261ff52d Sync docs from 2.0.x to gh-pages buildmaster 2017-11-04 01:50:25 +00:00
  • 3ba70f9b08 Sync docs from master to gh-pages buildmaster 2017-11-04 01:20:36 +00:00
  • da620649cf Fixing build Marcin Grzejszczak 2017-11-03 22:56:36 +01:00
  • c45537da95 Merge branch 'master' into 2.0.x Marcin Grzejszczak 2017-11-03 22:48:24 +01:00
  • 4203566d87 Exceptions that escape SpringMVC DispatcherServlet should be logged with trace & span IDs Marcin Grzejszczak 2017-11-03 22:41:50 +01:00
  • 00e5b71d24 Sync docs from 1.2.x to gh-pages buildmaster 2017-11-03 02:58:39 +00:00
  • 7fe42a770b Sync docs from 2.0.x to gh-pages buildmaster 2017-11-03 01:50:34 +00:00
  • a23e7ec872 Sync docs from master to gh-pages buildmaster 2017-11-03 01:20:37 +00:00
  • 854fd67109 Removed security code Marcin Grzejszczak 2017-11-02 06:13:05 +01:00