Skip to content

TOOL-16941 cloud-init: upstream merge conflict resolution #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prakashsurya merged 2 commits into from
Nov 30, 2022
Merged

TOOL-16941 cloud-init: upstream merge conflict resolution #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8b597d
Version: 22.3.4-0ubuntu1~20.04.1
Nov 4, 2022
8598288
Merge remote-tracking branch 'origin/upstreams/6.0/stage' into 6.0/stage
Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 0 additions & 40 deletions .github/workflows/cla.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ stage
.vscode/
htmlcov/
tags
.hypothesis/

# Ignore packaging artifacts
cloud-init.dsc
Expand Down
3 changes: 1 addition & 2 deletions .pc/applied-patches
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
retain-apt-partner-pocket.patch
cpick-a2e62738-Fix-cc_phone_home-requiring-tries-1500
cpick-b0534cbf-Remove-schema-errors-from-log
expire-on-hashed-users.patch
203 changes: 0 additions & 203 deletions .pc/cpick-a2e62738-Fix-cc_phone_home-requiring-tries-1500/cloudinit/config/cc_phone_home.py
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...62738-Fix-cc_phone_home-requiring-tries-1500/tests/unittests/config/test_cc_phone_home.py
View file
Open in desktop

This file was deleted.

Loading