Merge branch 'OES-1.33.x' into feature/OP-22255-OES-upgrade-1.33.x

OpsMx · Jun 11, 2024 · 83e2789 · 83e2789
2 parents d41a11f + 894f39d
commit 83e2789
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/halyard-core/halyard-core.gradle b/halyard-core/halyard-core.gradle
@@ -33,4 +33,5 @@ dependencies {
   implementation 'com.google.apis:google-api-services-compute:+' //alpha-rev20200526-1.30.9")
   testImplementation 'org.springframework.boot:spring-boot-starter-test'
   testImplementation 'org.springframework:spring-test'
+
 }
diff --git a/settings.gradle b/settings.gradle
@@ -39,6 +39,7 @@ if (spinnakerGradleVersion.endsWith('-SNAPSHOT')) {
   }
 }
 
+
 enableFeaturePreview("VERSION_ORDERING_V2")
 
 rootProject.name="halyard"
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ if (spinnakerGradleVersion.endsWith('-SNAPSHOT')) { @@
       }
     }
     enableFeaturePreview("VERSION_ORDERING_V2")
     rootProject.name="halyard"
@@ Expand Down @@