Spencer Gibb
8ba5b661f3
Merge branch 'master' into 2.0.x
2017-10-18 14:51:44 -04:00
Spencer Gibb
a822e84711
Update DiscoveryClientHostLocator to use Registration.
...
Leave deprecated constructor with use of deprecated DiscoveryClient.getLocalServiceInstance()
see https://github.com/spring-cloud/spring-cloud-commons/issues/265
2017-10-18 14:51:24 -04:00
Marcin Grzejszczak
16220f6df8
Merge branch 'master' into 2.0.x
2017-10-18 19:04:22 +02:00
Marcin Grzejszczak
c3f8c2d8e5
Changed to RelaxedPropertyResolver from Environment
2017-10-18 18:50:17 +02:00
Marcin Grzejszczak
0439a7c7b0
Merge branch 'master' into 2.0.x
2017-10-18 18:07:57 +02:00
Marcin Grzejszczak
d02c62bb44
Resolve service name at runtime when sending a span to Zipkin; fixes #749
2017-10-18 16:18:41 +02:00
Marcin Grzejszczak
0673dc1eef
Merge branch 'master' into 2.0.x
2017-10-16 10:23:40 +02:00
Marcin Grzejszczak
83be1229a1
Fixed case of stream headers
2017-10-16 10:23:33 +02:00
Marcin Grzejszczak
bb8dd93718
Merge branch 'master' into 2.0.x
2017-10-16 09:56:51 +02:00
Marcin Grzejszczak
93682d44dd
Merge branch '1.2.x'
2017-10-16 09:56:41 +02:00
Marcin Grzejszczak
9ec8283101
Spring Cloud Sleuth is treating comma separated Stream headers in an invalid way
...
without this change when you pass Stream message headers that are comma separated, Sleuth fails to add proper binding properties for them
with this change we try to first split the headers (assuming that they might be comma based) and then we generate the proper header binding properties
fixes #742
2017-10-16 09:56:27 +02:00
Marcin Grzejszczak
c82c52b5ce
Fixed some tests
2017-10-04 16:31:51 +02:00
Marcin Grzejszczak
2b7a254d96
Bumping versions to 1.2.6.BUILD-SNAPSHOT after release
2017-10-03 14:28:31 +02:00
Marcin Grzejszczak
a69610fc0d
Going back to snapshots
2017-10-03 14:28:31 +02:00
Marcin Grzejszczak
2cb7663ec8
Update SNAPSHOT to 1.2.5.RELEASE
2017-10-03 14:26:25 +02:00
Marcin Grzejszczak
88c007698e
Merge branch 'master' into 2.0.x
2017-09-30 18:55:49 +02:00
Marcin Grzejszczak
1937d15553
Merge branch '1.2.x'
2017-09-30 18:55:37 +02:00
Marcin Grzejszczak
16cd03a82b
Ensured that the stream auto configuration gets registered after the Integration one; fixes #719
2017-09-30 18:55:25 +02:00
Marcin Grzejszczak
535e9f88ef
Merge branch 'master' into 2.0.x
2017-09-29 12:21:30 +02:00
Marcin Grzejszczak
1311bbb39e
Ignored all broken tests
2017-09-29 11:38:31 +02:00
Marcin Grzejszczak
4bf4484dcd
Merge branch '1.2.x'
2017-09-19 10:59:58 +01:00
Marcin Grzejszczak
867a49bac8
Reusing environment to get address; fixes #701
2017-09-19 10:59:51 +01:00
Dave Syer
d51ea611e4
Merge branch 'master' into 2.0.x
2017-08-29 08:22:48 +01:00
Dave Syer
673658e7c4
Remove unnecessary .google files
2017-08-29 08:22:17 +01:00
Marcin Grzejszczak
895673c164
Going back to snapshots
2017-08-25 13:50:16 +02:00
Marcin Grzejszczak
2561094ac4
Update SNAPSHOT to 2.0.0.M2
2017-08-25 13:48:56 +02:00
Marcin Grzejszczak
f14f5efe43
Going back to snapshots
2017-08-25 12:47:28 +02:00
Marcin Grzejszczak
61ca762dd4
Update SNAPSHOT to 1.3.0.M1
2017-08-25 12:44:31 +02:00
Marcin Grzejszczak
db5e16f998
Merge branch 'master' into 2.0.x
2017-08-25 12:04:41 +02:00
Marcin Grzejszczak
b83caf4ac0
Polish
2017-08-25 11:52:14 +02:00
Marcin Grzejszczak
17df781524
Bumping versions to 1.2.5.BUILD-SNAPSHOT after release
2017-08-21 10:06:48 +02:00
Marcin Grzejszczak
cbddd5568c
Going back to snapshots
2017-08-21 10:06:47 +02:00
Marcin Grzejszczak
5eba47d891
Update SNAPSHOT to 1.2.4.RELEASE
2017-08-21 10:01:14 +02:00
Marcin Grzejszczak
02a0c864e8
Bumping versions to 1.2.4.BUILD-SNAPSHOT after release
2017-08-18 18:46:50 +02:00
Marcin Grzejszczak
73211f673b
Going back to snapshots
2017-08-18 18:46:49 +02:00
Marcin Grzejszczak
47612da5cc
Update SNAPSHOT to 1.2.3.RELEASE
2017-08-18 18:36:51 +02:00
Marcin Grzejszczak
e8d30be75e
Going back to snapshots
2017-07-21 12:58:54 +02:00
Marcin Grzejszczak
932f8e74d3
Update SNAPSHOT to 1.2.2.RELEASE
2017-07-21 12:30:53 +02:00
Marcin Grzejszczak
8c98386c14
WIP
2017-07-15 19:39:48 +02:00
Marcin Grzejszczak
362f20d0a8
WIP
2017-07-15 15:15:39 +02:00
Marcin Grzejszczak
56457ce849
Going back to snapshots
2017-06-29 17:04:01 +02:00
Marcin Grzejszczak
0f5e28d078
Update SNAPSHOT to 2.0.0.M1
2017-06-29 16:59:54 +02:00
Marcin Grzejszczak
da629f78d3
Merge branch 'master' into 2.0.x
2017-06-29 08:55:59 +02:00
Marcin Grzejszczak
2f6a8df5fe
Removes deprecations; fixes #621
2017-06-29 08:49:40 +02:00
Marcin Grzejszczak
0f28a43444
Merge branch 'master' into 2.0.x
2017-06-27 15:39:27 +02:00
Marcin Grzejszczak
92d7c3443a
Bumped libraries
...
awaitillity to 3.0.0
wiremock to 2.6.0
junit params to 1.1.0
assertj to 3.8.0
fixes #620
2017-06-27 15:05:39 +02:00
Marcin Grzejszczak
474493a54d
Bumped libs
2017-06-27 14:02:43 +02:00
Marcin Grzejszczak
c2d9c4b94e
Should be working
2017-06-02 19:57:37 +02:00
Marcin Grzejszczak
83cc5b8064
Fixing tests
2017-06-02 17:10:42 +02:00
Marcin Grzejszczak
ddf4ea131d
WIP
2017-06-02 13:58:09 +02:00
