Skip to content

Commit 3486551

Browse files
authored
Merge branch 'main' into update-low-code-rag-oic-genai-23ai
2 parents 16c29bb + 150b429 commit 3486551

File tree

142 files changed

+3062
-755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+3062
-755
lines changed

app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>junit</groupId>
3535
<artifactId>junit</artifactId>
36-
<version>4.12</version>
36+
<version>4.13.1</version>
3737
<scope>test</scope>
3838
</dependency>
3939
<dependency>

app-dev/devops-and-containers/functions/java-helloworld-with-local-dev-and-oci-functions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>junit</groupId>
3535
<artifactId>junit</artifactId>
36-
<version>4.12</version>
36+
<version>4.13.1</version>
3737
<scope>test</scope>
3838
</dependency>
3939
</dependencies>
File renamed without changes.
File renamed without changes.

cloud-infrastructure/storage/block-storage/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Reviewed: 23.01.2024
2424
- [Showcase 2: TRIM showcase](showcase-2)
2525
- [Showcase 3: boot/block volume security best practice](showcase-3)
2626
- [Showcase 4: boot/block volume individual (to a customer-managed bucket) backup and restore](showcase-4)
27+
- [Showcase 5: Shatter the Million IOPS Barrier in the Cloud with OCI Block Storage](https://gitlab.com/hmielimo/next-generation-cloud/-/tree/main/doc/oci.block.storage.plan.and.proof)
2728

2829

2930
# Useful Links

cloud-infrastructure/vmware-solutions/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# VMware Solutions
22

3-
This area focuses on Oracle Cloud VMware Solution, Oracle Cloud Migrations & Oracle Secure Desktops.
3+
This area focuses on Oracle Cloud VMware Solution, Oracle Secure Desktops and Oracle Cloud Migration.
4+
5+
6+
# Reusable Assets Overview
7+
8+
- [Secure Desktop Solution Definition Document](https://github.com/oracle-devrel/technology-engineering/tree/main/cloud-infrastructure/vmware-solutions/oracle-secure-desktops/secure-desktops-solution-definition)
9+
410

511
# License
612

cloud-infrastructure/vmware-solutions/oracle-cloud-migrations/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Oracle Cloud Migrations enables customers to migrate virtual machines to Oracle Cloud Infrastructure (OCI) Compute instances. It helps customers eliminate manual migration tasks and ultimately reduces errors in asset discovery and migration planning and execution.
44

5-
Reviewed: 11.12.2023
5+
Reviewed: 31.05.2024
66

77
# Table of Contents
88

@@ -27,6 +27,12 @@ Reviewed: 11.12.2023
2727

2828
- [Cloud Coaching Clinic - Introduction to Oracle Cloud Migrations](https://www.youtube.com/watch?v=a1C3vZh5Wno)
2929
- In this Cloud Coaching Clinic session, we talk about the Oracle Cloud Migrations Service and how it enables you to migrate VMs from your on-premises VMware environments to OCI Compute VMs.
30+
31+
# Reusable Assets Overview
32+
33+
- [OCM Solution Definition Document](https://github.com/oracle-devrel/technology-engineering/tree/main/cloud-infrastructure/vmware-solutions/oracle-cloud-migrations/ocm-solution-definition-document)
34+
35+
3036

3137
# License
3238

cloud-infrastructure/vmware-solutions/oracle-cloud-vmware-solution/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Oracle Cloud VMware Solution is based on VMware Cloud Foundation (VCF) and provides a fully supported, customizable cloud environment for VMware deployments and migrations. The solution delivers a full-stack software-defined data center (SDDC), including VMware’s vCenter, ESXi, NSX, and vSAN. Specific use cases targeted by Oracle Cloud VMware Solution include data center and application migration, hybrid extension, on-demand capacity, and disaster recovery.
44

5-
Reviewed: 30.05.2024
5+
Reviewed: 31.05.2024
66

77
# Table of Contents
88

@@ -127,6 +127,9 @@ Reviewed: 30.05.2024
127127
# Reusable Assets Overview
128128

129129
- [Automating OCVS operations using Terraform](https://github.com/oracle-devrel/technology-engineering/tree/main/cloud-infrastructure/vmware-solutions/oracle-cloud-vmware-solution/OCVS-Terraform-automation)
130+
131+
- [Disaster Recovery to OCVS with HCX or SRM Solution Definition Document](https://github.com/oracle-devrel/technology-engineering/tree/main/cloud-infrastructure/vmware-solutions/oracle-cloud-vmware-solution/disaster-recovery-to-ocvs-with-hcx-or-srm-solution-definition/)
132+
130133

131134
# License
132135

0 commit comments

Comments
 (0)