Skip to content
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

Jump to bottom

(PDK-972) Don't register a pending change when deleting non-existent files #585

Merged
merged 1 commit into from
Oct 30, 2018
Merged

(PDK-972) Don't register a pending change when deleting non-existent files #585

merged 1 commit into from
Oct 30, 2018

Conversation

rodjek
Copy link
Contributor

@rodjek rodjek commented Oct 29, 2018 

semirhage :0: pdk/foo (git:master → origin U:1 ?:1!)$ ../bin/pdk update
pdk (INFO): Updating tsharpe-foo using the default template, from master@bcb7883 to master@bcb7883

-----------Files to be removed----------
.gitlab-ci.yml

----------------------------------------
Do you want to continue and make these changes to your module? Yes

------------Update completed------------

.

semirhage :0: pdk/foo (git:master → origin U:1 ?:1!)$ ../bin/pdk update
No changes required.

@coveralls
Copy link

coveralls commented Oct 29, 2018 •
edited
Loading

Coverage Status

Coverage increased (+0.002%) to 92.934% when pulling b0a11f6 on rodjek:pdk-972 into be59893 on puppetlabs:master.

@scotje
Copy link
Contributor

scotje commented Oct 29, 2018

Hmmm, bundle resolution failure due to net-ssh and ruby version incompatibility. Don't see that anything has really changed with the relevant gems and their dependencies though :/

scotje
scotje approved these changes Oct 29, 2018
View reviewed changes
Copy link
Contributor

@scotje scotje left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes look good, assuming we can get CI green I'm 👍

@rodjek
(PDK-972) Don't register a pending change when deleting non-existent …
b0a11f6 
…files

```
semirhage :0: pdk/foo (git:master → origin U:1 ?:1!)$ ../bin/pdk update
pdk (INFO): Updating tsharpe-foo using the default template, from master@bcb7883 to master@bcb7883

-----------Files to be removed----------
.gitlab-ci.yml

----------------------------------------
Do you want to continue and make these changes to your module? Yes

------------Update completed------------

.

semirhage :0: pdk/foo (git:master → origin U:1 ?:1!)$ ../bin/pdk update
No changes required.
```
@rodjek rodjek merged commit f1688e9 into puppetlabs:master Oct 30, 2018
@rodjek rodjek deleted the pdk-972 branch October 30, 2018 11:04
@bmjen bmjen added the bug label Nov 1, 2018
@ragnarkon ragnarkon mentioned this pull request Nov 30, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scotje scotje scotje approved these changes

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rodjek @coveralls @scotje @bmjen