Commit Graph

112 Commits

Author SHA1 Message Date
buildmaster
3a780623c1 Going back to snapshots 2017-10-27 15:49:29 +00:00
buildmaster
698124544c Update SNAPSHOT to 2.0.0.M3 2017-10-27 15:48:50 +00:00
Ryan Baxter
6a7b5bc750 Merge remote-tracking branch 'origin/master' into 2.0.x 2017-09-25 14:11:06 -04:00
Ryan Baxter
dd16ce0a31 Remove the need for @EnableDiscoveryClient (#245)
Enable AutoServiceRegistrationConfiguration by default.
2017-09-25 12:21:02 -04:00
Marcin Grzejszczak
752148fea5 Merge branch 'master' into 2.0.x 2017-08-31 14:55:05 +02:00
Marcin Grzejszczak
99488a163b Merge branch '1.2.x' 2017-08-31 14:54:24 +02:00
Marcin Grzejszczak
8c42673d30 Referrencing resources from sc-build 2017-08-31 14:54:17 +02:00
Marcin Grzejszczak
b1a79ce2bc Merge branch 'master' into 2.0.x 2017-08-29 15:46:20 +02:00
Marcin Grzejszczak
8ce23984fe Merge branch '1.2.x' 2017-08-29 15:46:03 +02:00
Marcin Grzejszczak
df3b9eee2e Added 1.2.x to whitelist 2017-08-29 15:44:49 +02:00
Marcin Grzejszczak
0b4a56fc27 Migrated to new docs; fixes #248 2017-08-29 15:43:02 +02:00
Marcin Grzejszczak
0f895b8c1b Merge branch 'master' into 2.0.x 2017-08-29 12:35:17 +02:00
Marcin Grzejszczak
565a805bcb Migrated to new docs; fixes #248 2017-08-29 12:33:06 +02:00
Spencer Gibb
aa1185e152 remove erroneous configuration from WebClient docs 2017-08-24 15:38:53 -06:00
Ryan Baxter
6ae5e0bec8 Going back to snapshots 2017-08-24 16:03:50 -04:00
Ryan Baxter
e6e5de275d Update SNAPSHOT to 1.3.0.M1 2017-08-24 16:02:42 -04:00
Spencer Gibb
0972699040 Going back to snapshots 2017-08-17 15:25:48 -06:00
Spencer Gibb
ac2821db5f Update SNAPSHOT to 2.0.0.M2 2017-08-17 15:17:19 -06:00
Spencer Gibb
09a5273096 Initial Load Balancer support for WebClient.
fixes gh-237
2017-08-15 17:28:45 -06:00
Ryan Baxter
2b5860fe4f Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-03 11:44:44 -04:00
Ryan Baxter
e8a42e500e Bumping versions to 1.2.4.BUILD-SNAPSHOT after release 2017-07-12 14:04:38 -04:00
Ryan Baxter
9a1c1bf634 Going back to snapshots 2017-07-12 14:04:38 -04:00
Ryan Baxter
7a9225619c Update SNAPSHOT to 1.2.3.RELEASE 2017-07-12 14:03:27 -04:00
Ryan Baxter
3d47188334 Added documentation 2017-07-09 14:15:11 -04:00
Spencer Gibb
2b6ad4a118 bump to version 1.3.0 2017-06-30 17:19:48 -06:00
Spencer Gibb
78511e19b4 Merge branch 'master' into 2.0.x
# Conflicts:
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java
2017-06-29 16:16:32 -06:00
Spencer Gibb
c953240620 Allow Discovery HealthIndicator description to be disabled.
fixes gh-223
2017-06-29 16:15:09 -06:00
Spencer Gibb
d4326005f9 Going back to snapshots 2017-06-16 14:54:23 -06:00
Spencer Gibb
02c522d015 Update SNAPSHOT to 2.0.0.M1 2017-06-16 14:53:15 -06:00
Spencer Gibb
0c041591d1 Bump to version 1.2.3.BUILD-SNAPSHOT 2017-05-19 14:59:52 -06:00
Spencer Gibb
6cfaea4bb7 Going back to snapshots 2017-05-19 14:57:35 -06:00
Spencer Gibb
79096fbf8d Update SNAPSHOT to 1.2.2.RELEASE 2017-05-19 14:54:42 -06:00
Jon Schneider
c02398959d Revert back to snapshots 2017-05-12 10:25:38 -05:00
Jon Schneider
9d53dd46bb Update SNAPSHOT to 1.2.1.RELEASE 2017-05-12 09:18:36 -05:00
Jon Schneider
bf905ccae0 Merge branch 'master' into 2.0.x 2017-05-11 14:24:56 -05:00
Jon Schneider
15aad9ca5f Point build badge to CircleCI 2017-05-11 14:20:47 -05:00
Spencer Gibb
b611e78075 Merge branch 'master' into 2.0.x
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-starter/pom.xml
2017-04-06 21:43:05 -06:00
Spencer Gibb
9675df02f6 Bumping versions to 1.2.1.BUILD-SNAPSHOT after release 2017-04-05 14:19:30 -06:00
Spencer Gibb
72685376a9 Going back to snapshots 2017-04-05 14:19:29 -06:00
Spencer Gibb
6b30820b09 Update SNAPSHOT to 1.2.0.RELEASE 2017-04-05 14:16:21 -06:00
Spencer Gibb
61199a151c Adds ServiceRegistry documentation.
fixes gh-170
fixes gh-196
2017-04-03 19:15:40 -06:00
Ryan Baxter
414b1704e1 Documenting property to disable retry logic with Spring Retry on the class path 2017-03-30 19:11:03 -04:00
Ryan Baxter
8e34e0c5e4 Set spring.cloud.loadbalancer.retry.enabled to true by default 2017-03-30 16:30:40 -04:00
Ryan Baxter
b896f22c3e Fixing documentation to add Spring Retry
Addresses documentation bug in #193
2017-03-29 19:34:46 -04:00
Spencer Gibb
d11abd8f5e make code compile 2017-03-17 18:46:39 -06:00
Spencer Gibb
23f3e461ac Going back to snapshots 2017-03-15 17:40:06 -06:00
Spencer Gibb
e75034a6fc Update SNAPSHOT to 1.2.0.RC1 2017-03-15 17:32:18 -06:00
Spencer Gibb
b4bd6fdeff Revert "Update SNAPSHOT to 1.2.0.M1"
This reverts commit d9d3b5f74a.
2017-01-26 10:41:16 -07:00
Spencer Gibb
d9d3b5f74a Update SNAPSHOT to 1.2.0.M1 2017-01-26 10:39:31 -07:00
Andreas Schöneck
373ef85079 Close verbatim block properly (#146)
Add missing backtick after RestTemplate in order to not have this blocker huger as intended.
2017-01-09 18:12:48 -05:00