Commit Graph

267 Commits

Author SHA1 Message Date
Olga MaciaszekSharma
925254e957 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/pom.xml
#	docs/src/main/asciidoc/_configprops.adoc
#	pom.xml
#	spring-cloud-consul-binder/pom.xml
#	spring-cloud-consul-config/pom.xml
#	spring-cloud-consul-core/pom.xml
#	spring-cloud-consul-dependencies/pom.xml
#	spring-cloud-consul-discovery/pom.xml
#	spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml
#	spring-cloud-starter-consul-all/pom.xml
#	spring-cloud-starter-consul-bus/pom.xml
#	spring-cloud-starter-consul-config/pom.xml
#	spring-cloud-starter-consul-discovery/pom.xml
#	spring-cloud-starter-consul/pom.xml
2021-03-04 11:24:55 +01:00
Olga MaciaszekSharma
5b2d5d565a Regenerate the docs. 2021-03-04 11:07:04 +01:00
Olga Maciaszek-Sharma
41d359a34b Add quickstart section to docs. (#710) 2021-03-04 11:02:20 +01:00
buildmaster
04b253ccaa Bumping versions to 2.2.7.BUILD-SNAPSHOT after release 2021-02-11 14:19:43 +00:00
buildmaster
b671396b2c Going back to snapshots 2021-02-11 14:19:43 +00:00
buildmaster
84553403c2 Update SNAPSHOT to 2.2.6.RELEASE 2021-02-11 14:18:03 +00:00
buildmaster
e7e3c69224 Bumping versions to 3.0.2-SNAPSHOT after release 2021-01-27 20:56:46 +00:00
buildmaster
6e16ed9b32 Going back to snapshots 2021-01-27 20:56:46 +00:00
buildmaster
0f25a90ebb Update SNAPSHOT to 3.0.1 2021-01-27 20:54:42 +00:00
buildmaster
33798362fa Bumping versions to 3.0.1-SNAPSHOT after release 2020-12-21 19:49:42 +00:00
buildmaster
aa35d98eef Going back to snapshots 2020-12-21 19:49:42 +00:00
buildmaster
eb98d86f85 Update SNAPSHOT to 3.0.0 2020-12-21 19:47:20 +00:00
spencergibb
26274094ed grammer 2020-12-20 13:44:23 -05:00
spencergibb
2dbbe2dced removes reference to config server 2020-12-20 13:41:09 -05:00
spencergibb
80fb075f4a Documents spring.config.import usage 2020-12-20 13:36:08 -05:00
Olga Maciaszek-Sharma
bc9f8ec39b Remove Ribbon references from docs. 2020-12-18 18:16:38 +01:00
buildmaster
be3ddb742e Going back to snapshots 2020-12-11 22:10:00 +00:00
buildmaster
dce1c76ca4 Update SNAPSHOT to 3.0.0-RC1 2020-12-11 22:08:47 +00:00
buildmaster
a66800b791 Going back to snapshots 2020-12-01 22:49:46 +00:00
buildmaster
e20b4c7c43 Update SNAPSHOT to 3.0.0-M6 2020-12-01 22:48:36 +00:00
buildmaster
47065733d2 Bumping versions 2020-11-19 12:33:53 +00:00
buildmaster
6c9d9b94a8 Going back to snapshots 2020-11-17 20:44:56 +00:00
buildmaster
527f63d6e3 Update SNAPSHOT to 3.0.0-M5 2020-11-17 20:43:42 +00:00
buildmaster
0ac79714ed Bumping versions 2020-11-17 12:34:36 +00:00
buildmaster
58fdb0af98 Bumping versions to 2.2.6.BUILD-SNAPSHOT after release 2020-11-09 10:44:30 +00:00
buildmaster
10c09a64ac Going back to snapshots 2020-11-09 10:44:30 +00:00
buildmaster
6c6e4e3d63 Update SNAPSHOT to 2.2.5.RELEASE 2020-11-09 10:43:04 +00:00
buildmaster
8015fe2218 Going back to snapshots 2020-10-03 14:00:36 +00:00
buildmaster
3369c2d6a7 Update SNAPSHOT to 3.0.0-M4 2020-10-03 13:59:12 +00:00
buildmaster
3213d76e5f Bumping versions 2020-09-29 12:33:56 +00:00
spencergibb
f77192b569 Merge branch '2.2.x' 2020-09-28 11:44:17 -04:00
bono007
4a6d7027f0 Allow ConsulHealthIndicator to bypass the services query
Fixes gh-646
2020-09-28 11:39:38 -04:00
Jay Bryant
cb9facd416 Wording changes (#649)
Replacing some terms
2020-09-28 11:00:03 -04:00
buildmaster
3e62d28564 Bumping versions to 2.2.5.BUILD-SNAPSHOT after release 2020-07-31 20:58:56 +00:00
buildmaster
a0447a7bdf Going back to snapshots 2020-07-31 20:58:55 +00:00
buildmaster
0783bca0e9 Update SNAPSHOT to 2.2.4.RELEASE 2020-07-31 20:56:45 +00:00
buildmaster
7cf89293cf Going back to snapshots 2020-07-23 18:29:28 +00:00
buildmaster
9362d83bf8 Update SNAPSHOT to 3.0.0-M3 2020-07-23 18:28:17 +00:00
buildmaster
23e6c1f9ae Bumping versions 2020-07-07 12:35:01 +00:00
spencergibb
9d4b62858e Merge branch '2.2.x' 2020-07-06 17:57:50 -04:00
buildmaster
ddd3030120 Bumping versions 2020-06-09 12:34:02 +00:00
Marcin Grzejszczak
a2d5cc84f0 Changed packaging to jar 2020-06-08 17:11:28 +02:00
Marcin Grzejszczak
edf32a14a0 Uploading sources for docs 2020-06-08 16:47:15 +02:00
Marcin Grzejszczak
4c4c897486 Migrated to docs.spring.io & updated sc-build 2020-06-04 13:40:17 +02:00
buildmaster
a352eb56bd Going back to snapshots 2020-05-29 18:43:33 +00:00
buildmaster
451c2c72cd Update SNAPSHOT to 3.0.0-M2 2020-05-29 18:42:31 +00:00
buildmaster
3f2892eab1 Bumping versions to 2.2.4.BUILD-SNAPSHOT after release 2020-05-28 17:59:50 +00:00
buildmaster
ed5440ba12 Going back to snapshots 2020-05-28 17:59:50 +00:00
buildmaster
099a30b265 Update SNAPSHOT to 2.2.3.RELEASE 2020-05-28 17:57:03 +00:00
buildmaster
ee3a264795 Bumping versions 2020-05-28 12:35:18 +00:00