8000 apply-hotfixes: use commits from upstream repo instead of a forked repo · HMcomcrazy/python@9182d09 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9182d09

Browse files
committed
apply-hotfixes: use commits from upstream repo instead of a forked repo
1 parent 0ea3542 commit 9182d09

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/apply-hotfixes.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fi
3838
# UPDATE: The commit being cherry-picked is updated since the the client generated in 1adaaecd0879d7315f48259ad8d6cbd66b835385
3939
# differs from the initial hotfix
4040
# Ref: https://github.com/kubernetes-client/python/pull/995/commits/9959273625b999ae9a8f0679c4def2ee7d699ede
41-
git cherry-pick -n a138dcbb7a9da972402a847ce982b027e0224e60
41+
git cherry-pick -n 9959273625b999ae9a8f0679c4def2ee7d699ede
4242
if [ $? -eq 0 ]
4343
then
4444
echo Succesfully patched changes for custom client behavior
@@ -51,7 +51,7 @@ fi
5151
# Patching commits for enabling from kubernetes import apis
5252
# UPDATE: The commit being cherry-picked is updated to include both the commits as one
5353
# Ref: https://github.com/kubernetes-client/python/blob/0976d59d6ff206f2f428cabc7a6b7b1144843b2a/kubernetes/client/apis/__init__.py
54-
git cherry-pick -n 228a29a982aee922831c3af4fef66a7846ce4bb8
54+
git cherry-pick -n 56ab983036bcb5c78eee91483c1e610da69216d1
5555
if [ $? -eq 0 ]
5656
then
5757
echo Succesfully patched changes for enabling from kubernetes import apis

0 commit comments

Comments
 (0)
0