SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
321 Commits 21 Branches 0 Tags
46b85cdcb4c4af0b6019dc3aae41ee57745ba785
Commit Graph

321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcin Grzejszczak
46b85cdcb4 Removed adoc footer 2016-09-07 18:01:27 +02:00
Marcin Grzejszczak
51e1b99197 Updating mvnw for all projects 2016-09-07 17:28:00 +02:00
Marcin Grzejszczak
d4b24d1293 Updating ghpages for all projects 2016-08-22 13:31:39 +02:00
Marcin Grzejszczak
e00a788992 Updating ghpages for all projects 2016-08-19 11:45:42 +02:00
Marcin Grzejszczak
68530ce89f Updating ghpages for all projects 2016-08-18 13:14:23 +02:00
Marcin Grzejszczak
6b80a4f513 Updated readme 2016-08-17 15:05:47 +02:00
Marcin Grzejszczak
44acf0b593 Updating ghpages for all projects 2016-08-17 12:44:18 +02:00
Marcin Grzejszczak
a8101e5b01 Deploying documentation to proper folder 
What we're missing ATM is different documentation versions for different application versions. What this change does is that it's:

- finding out what is the current branch (e.g. 1.0.x)
- finding out out what is the name of the main adoc file (e.g. spring-cloud-sleuth)
- pulling the changes from gh-pages after checkout
- finding out what is the list of comma separated whitelisted branches (via the `docs.whitelisted.branches` prop)
- in gh-pages creating a folder with name of the branch  (e.g. /1.0.x)
copying all the docs/target/generated-docs/ to that folder
- if the branch from which we're calling the script is NOT master then we're changing the ${main.adoc}.html to index.html so that it's easier to access the docs (e.g. http://cloud.spring.io/spring-cloud-sleuth/1.0.x/)
 2016-08-16 15:14:24 +02:00
Spencer Gibb
cc54bcbd62 Update to SNAPSHOT 2016-06-30 16:09:39 -06:00
Spencer Gibb
ea20ef3986 Update SNAPSHOT to 1.0.2.RELEASE 2016-06-30 15:56:33 -06:00
Spencer Gibb
c2ff08b665 Remove @ConditionalOnBean 
Doesn't make much sense, since it will be created in the parent class.

fixes gh-198
 2016-06-14 17:45:40 -06:00
Dave Syer
c091bd24e9 Update readme script to handle local includes 2016-06-11 09:54:41 +01:00
Spencer Gibb
e1082b8cd7 Update to SNAPSHOT 2016-06-07 12:34:31 -06:00
Spencer Gibb
e7b7c31cf7 Update SNAPSHOT to 1.0.1.RELEASE 2016-06-07 12:27:35 -06:00
Spencer Gibb
4fd07d96ac Upgrade consul-api to 1.1.10 
fixes gh-196
 2016-06-07 11:54:20 -06:00
Spencer Gibb
0fe6039cac Merge pull request #195 from aantono/master 
* pull195:
  Allow customized Management Port.
 2016-06-07 11:34:46 -06:00
Alex Antonov
8bfa3f8828 Allow customized Management Port. 
Added support for customized configuration of the Management Port.
(useful when running separate mgmt context inside docker, with 2 port
mappings)
 2016-06-07 11:34:17 -06:00
Dave Syer
9231ae7f18 Update tp mvn 3.3.9 2016-06-04 09:14:39 +01:00
Spencer Gibb
0da575893d Merge pull request #166 from Fitzoh/master 
* pull166:
  Adds configurable default service tag for queries.
 2016-06-03 15:32:26 -06:00
Fitzgerald, Andrew
18456bccbf Adds configurable default service tag for queries. 2016-06-03 15:13:23 -06:00
Spencer Gibb
2b38a3c275 Merge pull request #191 from lowzj/rxjava-dependency 
* rxjava-dependency:
  Use 'spring-cloud-starter-ribbon' directly.
 2016-06-03 13:41:19 -06:00
lowzj
6e73cfa9da Use 'spring-cloud-starter-ribbon' directly. 
Use dependency 'spring-cloud-starter-ribbon' instead of using
netflix.ribbon directly. This brings in the correct version of
'io.reactivex:rxjava' even in 'spring-cloud-dependencies' pom
is not used.

Removed spring-cloud-starter-archaius because it is brought in
by the ribbon starter.
 2016-06-03 13:40:56 -06:00
Spencer Gibb
c6cdaa1362 Merge pull request #182 from bpgray/issue-181 
* issue-181:
  reduce logging on ConfigWatch connection failure
 2016-06-03 11:18:32 -06:00
Bill Gray
8206c2c923 reduce logging on ConfigWatch connection failure 
fixes gh-181
 2016-06-03 11:18:18 -06:00
Spencer Gibb
cf998fffae Merge pull request #190 from stephaneLeroy/fix-ttl-rate 
* fix-ttl-rate:
  Improve Consul TTL Check management
 2016-06-03 10:53:40 -06:00
Stéphane Leroy
650552dbab Improve Consul TTL Check management 
Remove spring.cloud.consul.discovery.heartbeat.fixedRate property and use a TaskScheduler (with FixedRateTrigger) to send Consul checks

Fixes gh-189
 2016-06-03 10:53:29 -06:00
Spencer Gibb
615db48fe7 Merge pull request #193 from imduffy15/patch-1 
Fix example segment of code
 2016-06-01 13:08:02 -06:00
Ian Duffy
01f28725e8 Fix example segment of code 
The discovery client example code attempts to call a `getInstances` function on a non existing client, this should be `discoveryClient`
 2016-06-01 19:52:48 +01:00
Dave Syer
ed246b7c2f Re-instate .settings.xml for Travis 2016-05-12 11:34:30 +01:00
Dave Syer
ab5d6f883c Update README and remove .settings.xml where appropriate 2016-05-12 10:47:36 +01:00
Marcin Grzejszczak
85a3f2b8aa Update runAcceptanceTests.sh 2016-05-11 14:30:45 +02:00
Dave Syer
039b1276a6 Update dependencies to their latest snapshot 2016-05-11 09:32:02 +01:00
Dave Syer
6fefb39f86 Update to 1.0.1 snapshots 2016-05-11 09:27:50 +01:00
Spencer Gibb
b4b0918c38 Update to snapshots 2016-05-10 14:55:14 -06:00
Spencer Gibb
ca9b92f98f Revert "Update SNAPSHOT to 1.0.0.RELEASE" 
This reverts commit c29a544409.
 2016-05-10 14:53:25 -06:00
Spencer Gibb
c29a544409 Update SNAPSHOT to 1.0.0.RELEASE 2016-05-10 14:50:18 -06:00
Dave Syer
c5a5c6bd98 Fix dependency order to nail spring-core version 2016-05-09 09:33:56 +01:00
Spencer Gibb
c4fb6b1cf8 More spring-core fixes 2016-05-06 11:32:24 -06:00
Dave Syer
c5b6aa57c1 Add explicit release disabled flag for artifactory for plugins 2016-05-06 18:09:41 +01:00
Dave Syer
a3f663ed35 Add explicit release disabled flag for artifactory in dependencies 2016-05-06 17:58:44 +01:00
Dave Syer
c2880bf6ea Add explicit release disabled flag for artifactory 2016-05-06 17:47:14 +01:00
Dave Syer
2808f07025 Switch parent of docs poms 2016-05-06 17:40:09 +01:00
Dave Syer
724340a26e Update parent to 1.1.0.RELEASE 2016-05-06 17:13:33 +01:00
Dave Syer
ca7d70f712 Tidy up dependencies a bit (and verify build with Boot 1.4) 2016-05-05 16:47:59 +01:00
Spencer Gibb
35fcf30a87 Merge pull request #179 from bpgray/log-deregister 
log consul deregister calls
 2016-04-27 13:24:07 -06:00
Bill Gray
bd50d543ba log consul deregister calls, for consistency with logging of consul register calls 2016-04-27 13:10:45 -06:00
Marcin Grzejszczak
e5780a3508 Unified the way e2e are executed 2016-04-26 17:33:47 +02:00
Spencer Gibb
5bf619ab02 Update to consul-api 1.1.9 
fixes gh-174
 2016-04-25 16:53:27 -06:00
Spencer Gibb
6e00f9ac5d set server.port 2016-04-25 16:53:05 -06:00
Marcin Grzejszczak
2234960ae5 Using unique identifiers for tests 2016-04-21 11:51:33 +02:00