codify changes from branch

PubMatic-OpenWrap · May 2, 2022 · 3370127 · 3370127
1 parent cf3c38e
commit 3370127
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/upgrade/upgrade-pbs.sh b/upgrade/upgrade-pbs.sh
@@ -148,8 +148,8 @@ log "At $(pwd)"
 
 if [ "$RESTART" -eq "1" ]; then
     # TODO: commit this in origin/master,ci and remove it from here.
-    git cherry-pick 1e4d8a529e9f7b17b2a9d6c5302c1cd325ac2420
-    git cherry-pick 3c127a4d9e1f22ce9c255e549cc7eacfa4190fce
+    git merge --squash origin/UOE-7610-1-codify 
+    git commit --no-edit
 fi
 
 major=0