Commit Graph

1914 Commits

Author SHA1 Message Date
Ryan Baxter
93b7cd2e45 Merging documentation changes 2023-12-27 14:48:45 -05:00
Ryan Baxter
8fbfa40ada Merge branch '3.0.x' 2023-12-27 14:48:36 -05:00
erabii
05fa5db03f Fix 1242 (#1550)
Fixes #1242
2023-12-27 14:44:50 -05:00
Ryan Baxter
c1d6cff655 Merge branch '3.0.x' 2023-12-26 16:11:42 -05:00
erabii
d39cd9d6f1 fix some typos in tests (#1551) 2023-12-26 16:11:05 -05:00
Ryan Baxter
d12a752153 Resolving merge conflicts in docs 2023-12-26 10:33:19 -05:00
Ryan Baxter
44fe4ac2a1 Merge branch '3.0.x' 2023-12-26 10:32:59 -05:00
Chris Bono
e82272b165 Clarify k8s ConfigMap property source instructions (#1549)
This commit updates the property-source-config.adoc to clarify the need
to escape the "kubernetes:" value for the 'spring.config.import'
property.

Co-authored-by: Ryan Baxter <rbaxter@vmware.com>
2023-12-26 10:29:40 -05:00
buildmaster
655651e326 Bumping versions 2023-12-23 21:33:48 +00:00
buildmaster
a774edae11 Bumping versions 2023-12-23 01:47:11 +00:00
Ryan Baxter
29fd546346 Merge branch '3.0.x' 2023-12-22 14:43:12 -05:00
erabii
3f4fe25cb2 group some tests under a common package (#1546) 2023-12-22 14:42:31 -05:00
Ryan Baxter
07c292bb70 Merge branch '3.0.x' 2023-12-21 19:02:22 -05:00
erabii
b0ac0e5b15 fix (#1544) 2023-12-21 19:01:55 -05:00
Ryan Baxter
3d04e8d4fa Merge branch '3.0.x' 2023-12-21 15:16:41 -05:00
erabii
a77c8c0996 fix issue (#1542) 2023-12-21 15:15:45 -05:00
Ryan Baxter
5954843cd8 Merge branch '3.0.x' 2023-12-21 14:30:14 -05:00
erabii
bf5b1fd4b0 fix 977 (#1540) 2023-12-21 14:24:56 -05:00
buildmaster
30584aecff Bumping versions 2023-12-19 21:33:48 +00:00
Ryan Baxter
64b884a817 Merge branch '3.0.x' 2023-12-19 14:11:37 -05:00
erabii
1a02243766 Move classes to commons (#1530) 2023-12-19 14:11:00 -05:00
buildmaster
12bb7b8168 Bumping versions 2023-12-19 01:48:15 +00:00
Ryan Baxter
cd2a4b6f17 Merge branch '3.0.x' 2023-12-18 15:14:39 -05:00
erabii
ca954de088 fix - 1237 (#1537) 2023-12-18 15:06:15 -05:00
Ryan Baxter
222c07f32a Merge branch '3.0.x' 2023-12-15 10:54:35 -05:00
erabii
0b50dba458 Minor cleanup in tests discovery (#1538) 2023-12-15 10:54:04 -05:00
Ryan Baxter
124faa0086 Porting documentation from #1536 2023-12-14 16:00:55 -05:00
Ryan Baxter
5020e7a7a4 Merge branch '3.0.x' 2023-12-14 15:59:11 -05:00
erabii
25e790d0e7 fix documentation (#1536) 2023-12-14 15:58:17 -05:00
Ryan Baxter
ca24fa3655 Merge branch '3.0.x' 2023-12-14 14:51:54 -05:00
erabii
913ee47b68 Refactor some tests (1) (#1533) 2023-12-14 14:50:53 -05:00
Ryan Baxter
b40f8f14e2 Porting documentation over after merge 2023-12-13 17:32:51 -05:00
Ryan Baxter
03c30ea866 Merge branch '3.0.x' 2023-12-13 17:30:12 -05:00
erabii
67d5846abc fix documentation (#1534) 2023-12-13 17:29:34 -05:00
Ryan Baxter
0f09a7977c Merge branch '3.0.x' 2023-12-11 16:05:44 -05:00
erabii
e55b4427d5 Correct path for tests (#1532) 2023-12-11 16:05:04 -05:00
Ryan Baxter
2b24164c56 Merge branch '3.0.x' 2023-12-07 16:37:15 -05:00
erabii
87d9c46eba fix (#1531) 2023-12-07 16:33:52 -05:00
buildmaster
29238535b0 Bumping versions to 3.1.1-SNAPSHOT after release 2023-12-06 19:19:14 +00:00
buildmaster
319d03c2a5 Going back to snapshots 2023-12-06 19:19:08 +00:00
buildmaster
edfdd60e9e Update SNAPSHOT to 3.1.0 2023-12-06 19:06:18 +00:00
Ryan Baxter
cd3dc11bf5 Merge branch '3.0.x' 2023-12-04 15:04:49 -05:00
erabii
d96c7c8bfe Drop overlapping configuration in reactive implementation (#1525) 2023-12-04 15:04:20 -05:00
buildmaster
535c33a4f4 Bumping versions 2023-12-03 21:31:37 +00:00
buildmaster
548a43adc0 Bumping versions 2023-12-01 01:54:01 +00:00
Ryan Baxter
393a83b649 Merge branch '3.0.x' 2023-11-30 16:16:40 -05:00
erabii
4bba72fc82 Drop overlapping configuration in blocking implementation (#1524) 2023-11-30 16:14:23 -05:00
Ryan Baxter
0862fe2e89 Merge branch '3.0.x' 2023-11-30 14:59:58 -05:00
erabii
0e7215e23e kubernetes discovery minor changes part 3 (#1523) 2023-11-30 14:59:28 -05:00
buildmaster
1f88d533c4 Bumping versions 2023-11-30 01:53:36 +00:00