Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 538774d Merge: 1a5f744 dcd7e14 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Thu Feb 8 08:50:21 2024 +0100 Merge branch 'main' into update-modelid commit 1a5f744 Merge: 699eec8 7e43195 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Wed Feb 7 17:35:02 2024 +0100 Merge branch 'main' into update-modelid commit 699eec8 Merge: 60cf261 7e43195 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Wed Feb 7 10:30:34 2024 +0100 Merge branch 'main' into update-modelid commit 60cf261 Merge: 2f726c2 3a7d3bd Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Wed Feb 7 10:22:51 2024 +0100 Merge branch 'main' into update-modelid commit 2f726c2 Merge: 5bdbbd6 59508ca Author: John Oliver <1615532+johnoliver@users.noreply.github.com> Date: Tue Feb 6 13:02:30 2024 +0000 Merge branch 'main' into update-modelid commit 5bdbbd6 Merge: ffcf68c eed5193 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Feb 2 22:44:25 2024 +0100 Merge branch 'main' into update-modelid commit ffcf68c Merge: 3a34f5d 52e317a Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Feb 2 12:15:47 2024 +0100 Merge branch 'main' into update-modelid commit 3a34f5d Merge: 7933961 e582951 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Feb 2 12:15:13 2024 +0100 Merge remote-tracking branch 'origin/update-modelid' into update-modelid commit 7933961 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Feb 2 12:14:50 2024 +0100 make Deployment Name optional and set modelid with default as requested in review commit b74843e Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Feb 2 12:13:39 2024 +0100 make Deployment Name optional and set modelid with default as requested in review commit e582951 Merge: f7f1664 5953beb Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Jan 26 22:56:33 2024 +0100 Merge branch 'main' into update-modelid commit f7f1664 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 26 22:51:38 2024 +0100 spring boot starter gets tested with samples commit be6cf95 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 26 12:46:23 2024 +0100 Need to use JDK 11 to build for JDK 8 commit 1af0f61 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 26 12:43:16 2024 +0100 Need to use JDK 11 to build for JDK 8 commit 5bebe6c Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 26 12:24:46 2024 +0100 move starter to example package commit 2f8a839 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 26 10:14:20 2024 +0100 switch back to jdk 8 and 17 as required by PM commit 9fdf375 Merge: 1e66ccb 038ca45 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 26 10:08:32 2024 +0100 Merge branch 'main' of https://github.com/SandraAhlgrimm/semantic-kernel into update-modelid # Conflicts: # .github/workflows/java-build.yml commit 038ca45 Merge: 21d161a e0ccee0 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Jan 26 10:03:52 2024 +0100 Merge branch 'microsoft:main' into main commit 21d161a Merge: a402026 4445327 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Jan 26 09:31:59 2024 +0100 Merge pull request #1 from bbenz/main bbenz Update java-build.yml commit a402026 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Jan 26 09:31:19 2024 +0100 Update java-build.yml commit 4445327 Author: Brian Benz <bbenz@microsoft.com> Date: Thu Jan 25 16:07:29 2024 -0800 bbenz Update java-build.yml Set JDK to 11 or 17 commit 1e66ccb Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Thu Jan 25 21:32:07 2024 +0100 Update java-build.yml update workflow as @bbenz suggested commit b69342a Merge: 79627be e0ccee0 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Thu Jan 25 21:30:42 2024 +0100 Merge branch 'microsoft:main' into update-modelid commit 79627be Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Thu Jan 25 18:22:56 2024 +0100 jdk 17 for spring boot starter commit 14e17ad Merge: 4570ad2 00fbab2 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Wed Jan 24 21:41:47 2024 +0100 Merge remote-tracking branch 'origin/update-modelid' into update-modelid commit 4570ad2 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Wed Jan 24 21:41:14 2024 +0100 cleaned up and ready for PR commit 00fbab2 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Wed Jan 24 21:39:57 2024 +0100 Update java-integration-tests.yml commit f5baf9e Merge: f76a4b0 f959256 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Wed Jan 24 21:33:28 2024 +0100 Merge branch 'microsoft:main' into update-modelid commit f76a4b0 Merge: a8cf41e e4874bb Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Mon Jan 22 16:08:03 2024 +0100 Merge branch 'microsoft:main' into update-modelid commit a8cf41e Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Mon Jan 22 16:03:22 2024 +0100 cleaned up and ready for PR commit 8d3d26a Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Thu Jan 18 22:43:40 2024 +0100 maven still needs a cleanup commit f811bc3 Merge: 43b0a7f c87e45e Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Wed Jan 17 22:27:39 2024 +0100 Merge remote-tracking branch 'origin/update-modelid' into update-modelid commit c87e45e Merge: 355eb68 fe23d41 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Wed Jan 17 22:20:29 2024 +0100 Merge branch 'microsoft:main' into update-modelid commit 43b0a7f Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Wed Jan 17 22:19:31 2024 +0100 add tests, maven needs a cleanup commit 355eb68 Merge: 4277528 f9bef63 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Tue Jan 16 15:40:51 2024 +0100 Merge branch 'microsoft:main' into update-modelid commit 4277528 Merge: f2cab02 9db47e5 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Mon Jan 8 14:22:56 2024 +0100 Merge branch 'microsoft:main' into update-modelid commit f2cab02 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 5 16:58:21 2024 +0100 update maven dependencies, test needs to be finished commit ec31872 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 5 15:52:49 2024 +0100 add spring boot starter commit ff87caa Merge: c1ccfe0 11369bf Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 5 13:16:21 2024 +0100 Merge remote-tracking branch 'origin/update-modelid' into update-modelid commit c1ccfe0 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 5 13:16:08 2024 +0100 add spring boot starter commit 11369bf Merge: ac73cb8 833a2d7 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Jan 5 13:13:37 2024 +0100 Merge branch 'microsoft:main' into update-modelid commit ac73cb8 Merge: c1f4ef8 4b9dbed Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 5 13:11:50 2024 +0100 Merge branch 'update-modelid' of https://github.com/SandraAhlgrimm/semantic-kernel into update-modelid commit c1f4ef8 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Jan 5 13:06:20 2024 +0100 add spring boot starter commit 4b9dbed Merge: 9da9b38 aa62b14 Author: John Oliver <1615532+johnoliver@users.noreply.github.com> Date: Thu Jan 4 12:46:38 2024 +0000 Merge branch 'main' into update-modelid commit 53d4bf7 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Wed Jan 3 20:14:32 2024 +0100 add spring boot starter commit 9da9b38 Merge: a3782cf 79908b0 Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Wed Jan 3 13:24:58 2024 +0100 Merge branch 'main' into update-modelid commit a3782cf Merge: a693099 240a2cb Author: Sandra Ahlgrimm <sandra.kriemann@gmail.com> Date: Fri Dec 22 11:40:14 2023 +0100 Merge branch 'microsoft:main' into update-modelid commit a693099 Author: SandraAhlgrimm <sakriema@microsoft.com> Date: Fri Dec 22 11:38:59 2023 +0100 update modelid to the available davinci-002 on Azure Open AI
- Loading branch information