Commit Graph

1793 Commits

Author SHA1 Message Date
Marcin Grzejszczak
e7b91c0a85 Merge branch 'master' into 2.0.x 2017-08-29 16:02:26 +02:00
Marcin Grzejszczak
5e9fa908b4 Merge branch '1.3.x' 2017-08-29 15:59:39 +02:00
Marcin Grzejszczak
91808c5fd9 Updated whitelists 2017-08-29 15:57:17 +02:00
Marcin Grzejszczak
0784b1ee19 Migrated to new docs; fixes #2237 2017-08-29 15:54:31 +02:00
Marcin Grzejszczak
b3cdd72754 Bumped libs' 2017-08-29 15:54:01 +02:00
Marcin Grzejszczak
9d2964ee7d Merge branch 'master' into 2.0.x 2017-08-29 15:07:14 +02:00
Marcin Grzejszczak
4a8913f7ea Migrated to new docs; fixes #2237 2017-08-29 15:04:32 +02:00
Ryan Baxter
8fbd73af1e Going back to snapshots 2017-08-24 17:54:53 -04:00
Ryan Baxter
1be2b2c295 Update SNAPSHOT to 1.4.0.M1 2017-08-24 17:49:28 -04:00
Ryan Baxter
02778fd670 fixing links in docs 2017-08-24 17:07:42 -04:00
Ryan Baxter
985f014f40 bumping sc-build version 2017-08-24 16:44:46 -04:00
Nastya Smirnova
2a63d07146 Extract getApplications method in CommonsInstanceDiscovery
This allows the ability to override behavior of retrieving configured applications
2017-08-21 13:49:42 -04:00
Ryan Baxter
947d30c5c4 Bumping versions to 1.3.5.BUILD-SNAPSHOT after release 2017-08-18 13:59:32 -04:00
Ryan Baxter
e71ce3395d Going back to snapshots 2017-08-18 13:59:31 -04:00
Ryan Baxter
f5e7be25dd Update SNAPSHOT to 1.3.4.RELEASE 2017-08-18 13:55:59 -04:00
Ryan Baxter
ded32cd66a Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-18 13:23:04 -04:00
Ryan Baxter
c8d024c25f Merge pull request #2213 from ryanjbaxter/deprecation-warnings-for-starters
Adds deprecation warning to starters
2017-08-18 13:21:25 -04:00
Ryan Baxter
b519ad8d18 Adds deprecation warning to starters. Fixes #2148. 2017-08-18 12:30:45 -04:00
Ryan Baxter
fcb1f5dc54 Bumping versions to 1.3.4.BUILD-SNAPSHOT after release 2017-08-18 07:55:23 -04:00
Ryan Baxter
9b7a2f93ad Going back to snapshots 2017-08-18 07:55:22 -04:00
Ryan Baxter
9ce253b644 Update SNAPSHOT to 1.3.3.RELEASE 2017-08-18 07:51:04 -04:00
Spencer Gibb
5a9d24044f Going back to snapshots 2017-08-17 16:02:06 -06:00
Spencer Gibb
b853da673c Update SNAPSHOT to 2.0.0.M2 2017-08-17 15:53:24 -06:00
Ryan Baxter
d56b5abde2 Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-17 14:48:24 -04:00
Ryan Baxter
24cbbb9a11 Merging 1.3.x into master 2017-08-17 14:47:45 -04:00
Ryan Baxter
ed57c8f0fa Merge pull request #2208 from ryanjbaxter/document-https-hystrix-dashboard
Document untrusted certificates when connecting to hystrix.stream endpoint
2017-08-17 14:32:52 -04:00
Ryan Baxter
07b99704ee Fixes #1523. Document untrusted certificates when connecting to hystrix.stream endpoint. 2017-08-17 14:02:14 -04:00
Biju Kunjummen
9440e4d153 Fixes #2083. Porting #1916 to the 1.3.x branch. 2017-08-17 12:29:23 -04:00
Spencer Gibb
1e1ade3cbd Merge branch 'master' into 2.0.x 2017-08-16 03:30:47 -06:00
Spencer Gibb
1840647458 Move EurekaClient.close() to EurekaRegistration.close().
This moves the lifecycle of the eureka client of of EurekaServiceRegistry.

fixes gh-2099
2017-08-16 00:53:40 -06:00
Spencer Gibb
7471dcd3bf Merge branch 'master' into 2.0.x 2017-08-10 14:06:42 -06:00
Spencer Gibb
c3114e65bf Merge branch '1.3.x' 2017-08-10 13:59:46 -06:00
Spencer Gibb
c2aa60f292 Update test of setContentLengthLong to include param.
Otherwise useServlet31 was always returning false.

fixes gh-2196
2017-08-10 13:58:45 -06:00
Spencer Gibb
96fb8d280e Merge branch 'master' into 2.0.x 2017-08-04 14:59:08 -06:00
Spencer Gibb
e4e29e1316 Move tests out of default and base package 2017-08-04 14:37:28 -06:00
Biju Kunjummen
63f975ad43 Sync up matching of ignored paths and route paths (#2163)
Signed-off-by: João Salavessa <joao.salavessa@sky.uk>
2017-08-04 15:41:58 -04:00
Olivier Bourgain
a01fc5b758 Fix check then act issue (#2160) 2017-08-04 15:40:10 -04:00
Ryan Baxter
a3953fba65 Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-04 11:00:46 -04:00
Ryan Baxter
481e31220b Merge remote-tracking branch 'origin/1.3.x' 2017-08-04 10:57:41 -04:00
Ryan Baxter
040ce4db81 Merge pull request #2177 from repos-jmp/1.3.x
Fixes gh-2125
2017-08-04 10:51:08 -04:00
Ryan Baxter
488075de9b Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-03 13:18:07 -04:00
Ryan Baxter
8fb89b25d9 Merge pull request #2080 from ryanjbaxter/http-client-centralization
Centralizing HTTP client creation and configuration
2017-08-03 13:02:09 -04:00
Jayanth MP
099c9024bb Fixes gh-2125
(Updated okhttp3 from v3.6.0 to v3.8.1)
2017-08-02 17:24:19 +05:30
Ryan Baxter
bd7e75f4b3 Merge remote-tracking branch 'Upstream/master' into http-client-centralization 2017-08-01 16:46:07 -04:00
Ryan Baxter
a358764b9a Merge remote-tracking branch 'origin/master' into 2.0.x 2017-07-31 20:53:26 -04:00
Ryan Baxter
b3d61a6de7 Removing duplicate install goal 2017-07-31 20:22:45 -04:00
Dave Syer
0bfd86880b Merge branch 'master' into 2.0.x 2017-07-26 12:14:25 +01:00
Dave Syer
e5b14e4177 Fix all the start poms to be jars again
They are all deprecated but that's no reason to break them.
2017-07-26 12:13:25 +01:00
Spencer Gibb
e9f0112e28 Merge branch 'master' into 2.0.x 2017-07-25 08:58:57 -06:00
Spencer Gibb
0de86d3faf fix hashCode 2017-07-25 08:58:39 -06:00