Skip to content

Commit

Permalink
Remove spurious newlines in markdown files noticed by markdowner.py
Browse files Browse the repository at this point in the history
  • Loading branch information
craigcomstock committed Aug 18, 2023
1 parent 8f6e1c0 commit bd923f2
Showing 1 changed file with 0 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ Or undo this operation with:
git switch -
Turn off this advice by setting config variable advice.detachedHead to false
```

Then build and install targeting the integration root directory. When installed from source masterfiles installs into the `masterfiles` directory.
Expand Down Expand Up @@ -614,7 +613,6 @@ Changes not staged for commit:
modified: templates/federated_reporting/psql_wrapper.sh.mustache
modified: templates/federated_reporting/pull_dumps_from.sh
modified: update.cf
```

Next we want to bring back any of our custom files. Look through the **deleted** files, identify your custom files and restore them with `git checkout`.
Expand Down Expand Up @@ -740,7 +738,6 @@ Changes not staged for commit:
modified: templates/federated_reporting/psql_wrapper.sh.mustache
modified: templates/federated_reporting/pull_dumps_from.sh
modified: update.cf
```

It's best to review the diff of **each** modified file to understand the upstream changes as well as identify any local modifications that need to be retained. You should always keep a good record of any modifications made to vendored files to ensure that nothing is lost during future framework upgrades.
Expand Down Expand Up @@ -889,7 +886,6 @@ index 15c0c40..4611098 100644
+
"DEBUG $(this.bundle): adding input='$(inputs)'"
if => isvariable("inputs");

```

Carefully review the diffs and merge or re-integrate your custom changes on top of the upstream files. If you identify changes to the vendored files consider re-integrating those changes in a way that does not modify vendored files, here for example we have migrated the integration of the custom policy to Augments (`def.json`).
Expand Down Expand Up @@ -1064,7 +1060,6 @@ Changes to be committed:
modified: templates/federated_reporting/pull_dumps_from.sh
new file: templates/federated_reporting/transfer_distributed_cleanup_items.sh
modified: update.cf
```

Make sure the policy validates and commit your changes.
Expand All @@ -1091,4 +1086,3 @@ Output:
```

Now your Masterfiles Policy Framework is upgraded and ready to be tested.

0 comments on commit bd923f2

Please sign in to comment.