Commit Graph

3171 Commits

Author SHA1 Message Date
buildmaster
b0ace4774e Update SNAPSHOT to 2.2.0.M1 2019-07-03 18:00:04 +00:00
Ryan Baxter
34c96c99cf Merge remote-tracking branch 'origin/2.1.x' 2019-07-03 11:27:08 -04:00
Ryan Baxter
54bd12c7c2 Separate and fix tests in SidecarApplicationTests (#3585)
* Separate and fix tests in SidecarApplicationTests.  Fixes #3584

* Renaming classes so they end in Tests
2019-07-03 11:17:27 -04:00
Spencer Gibb
f29ea94f6e Bumps to 2.1.3.BUILD-SNAPSHOT and build to 2.1.7 2019-06-21 12:11:45 -04:00
Dave Syer
5741326cb5 Add jaxb-runtime to eureka server starter
See https://github.com/spring-io/start.spring.io/issues/119
2019-06-21 11:31:22 -04:00
buildmaster
609c66c2f0 Bumping versions to 2.1.4.BUILD-SNAPSHOT after release 2019-06-20 16:56:25 +00:00
buildmaster
58643b0aae Going back to snapshots 2019-06-20 16:56:24 +00:00
buildmaster
d20f70a0c3 Update SNAPSHOT to 2.1.2.RELEASE 2019-06-20 16:48:20 +00:00
Greg Adams
c24e7e05bf conditional sidecar autoconfig EurekaInstanceConfigBean (#3568)
fix for gh-3545
2019-06-17 20:43:08 -04:00
Spencer Gibb
fd710d8a7d Merge branch '2.1.x' 2019-06-13 20:10:40 -04:00
Spencer Gibb
b6814e1133 Updates eureka to 1.9.12 2019-06-13 20:07:23 -04:00
Spencer Gibb
62deb59314 Rename freemarker templates to ftlh
fixes gh-3566
2019-06-13 19:51:37 -04:00
Spencer Gibb
925f460d64 Rename freemarker templates to ftlh
fixes gh-3566
2019-06-13 19:38:07 -04:00
buildmaster
232bff2041 Bumping versions to 2.1.3.BUILD-SNAPSHOT after release 2019-06-11 19:08:47 +00:00
buildmaster
e9b1dcd2fd Going back to snapshots 2019-06-11 19:08:47 +00:00
buildmaster
42a8855370 Update SNAPSHOT to 2.1.2.RELEASE 2019-06-11 18:59:05 +00:00
Spencer Gibb
6c2359a0ca Merge branch '2.1.x' 2019-06-10 12:33:50 -04:00
Spencer Gibb
3770d6c14f Updates eureka to 1.9.10
fixes gh-3553
2019-06-10 12:33:30 -04:00
Spencer Gibb
571d1b7bb7 Merge branch '2.1.x' 2019-06-05 15:44:45 -04:00
Spencer Gibb
b975b31d97 Merge branch '2.0.x' into 2.1.x 2019-06-05 15:44:18 -04:00
Chris White
4145df96dc Filter WebServerInitializedEvent for web-only. (#3514)
Filter WebServerInitializedEvent for web-only, excluding management.

Fixes gh-2732
2019-06-05 14:35:49 -04:00
PeichengLiu
c01d9e6b59 fix a syntax error in the document (#3525) 2019-06-03 10:18:48 -04:00
Ryan Baxter
609b4f5838 Moving to Horsham 2019-05-29 11:25:41 -04:00
Olga Maciaszek-Sharma
23e1c36462 Reformat with the newest Spring javaformat plugin version 2019-05-29 16:35:22 +02:00
Olga Maciaszek-Sharma
4d765b37bb Merge branch '2.1.x' 2019-05-29 16:22:15 +02:00
HeemangHan
e0d8cc5469 fix typo (#3543) 2019-05-29 16:21:13 +02:00
Siavash Shaghafi
e606cc527e adds caution about property name case-sensitivity (#3533)
* adds caution about property name case-sensitivity

* applies review suggestion
2019-05-23 13:55:27 +02:00
Ryan Baxter
4403e1c8ff Merge remote-tracking branch 'origin/2.1.x' 2019-05-21 13:00:16 -04:00
Ryan Baxter
fbb59f8d0a Merge remote-tracking branch 'origin/2.0.x' into 2.1.x 2019-05-21 12:59:48 -04:00
Ryan Baxter
066ffa3fea Merge branch 'aftersss-2.0.x.fix' into 2.0.x 2019-05-21 12:45:21 -04:00
Ryan Baxter
fe3dfcc4e8 Polishing documentation 2019-05-21 12:44:30 -04:00
Ryan Baxter
a2ee96ebb9 Merge branch '2.0.x.fix' of https://github.com/aftersss/spring-cloud-netflix into aftersss-2.0.x.fix 2019-05-21 11:10:07 -04:00
Ryan Baxter
0b0f5d2334 Merge branch 'master' of github.com:spring-cloud/spring-cloud-netflix 2019-05-21 11:09:30 -04:00
Ryan Baxter
25cd7a5810 Formatting changes 2019-05-21 11:09:18 -04:00
Dave Syer
7aab07365d Add jaxb-runtime to eureka server starter
See https://github.com/spring-io/start.spring.io/issues/119
2019-05-20 10:40:35 +01:00
Dave Syer
6acaa9be8b Update xstream to latest patch level 2019-05-13 13:52:10 +01:00
Dave Syer
11a9819e3b Tweak test to work with Java 12
Also some format changes (checkstyle/Boot plugin)
2019-05-13 10:57:55 +01:00
Dave Syer
4997b69433 Remove deprecated class usage 2019-05-13 09:14:23 +01:00
Dave Syer
e2f1f368b5 Make http trace filter bean injection conditional
Recent changes in Spring Boot have meant that there is no longer
an httpTraceFilter bean by default. We can just make it conditional.

Fixes gh-3528
2019-05-13 09:04:55 +01:00
Ryan Baxter
7ea5c3a32f Merge remote-tracking branch 'origin/2.1.x' 2019-05-10 14:23:30 -04:00
Ryan Baxter
bd46dc4233 Merge remote-tracking branch 'origin/2.0.x' into 2.1.x 2019-05-10 14:22:52 -04:00
Ryan Baxter
cc12f2e82f Cleanup ThreadLocal in SendResponseFilter. Fixes #2283 (#3530) 2019-05-10 13:52:45 -04:00
wenqi.huang
2bbb537b17 Add some documentation about the property eureka.client.refresh.enable 2019-05-03 10:52:54 +08:00
wenqi.huang
84ccefcd4a Add some documentation about the property eureka.client.refresh.enable 2019-05-03 10:42:40 +08:00
Marcin Grzejszczak
03b1e326ce Added sagan pages; fixes gh-3521 2019-04-29 13:21:56 +04:00
Spencer Gibb
7449915919 Bumps to Germantown 2019-04-25 10:28:47 +02:00
wenqi.huang
7fd55be4b3 Add more tests for @ConditionalOnRefreshScope 2019-04-11 18:28:09 +08:00
wenqi.huang
ffebfebe31 Add more tests for @ConditionalOnRefreshScope 2019-04-11 18:02:24 +08:00
wenqi.huang
bf1cc4d270 Give users a choice to determine whether the EurekaClient instance can be refreshed or not. 2019-04-11 17:19:50 +08:00
Ryan Baxter
0e66862cbb Merge remote-tracking branch 'origin/2.1.x' 2019-04-10 20:29:34 -04:00