From what I can see, develop and master diverged at commit 65b3919 made against master, not part of the develop branch.
So all commits to develop since the commit previous to it (897ca9f) are divorced from the master branch.
In order to have the latest dev (this release) be mergeable to master, I did a squash of all the commits from 5c30f1f (the point at which develop and master bifurcate) on this branch and rebased on master. So this PR merges fine. I verified that git diff develop master is the same as git diff release0.12.14-b master.

This hack only allows us to merge the latest changes in develop to master for the release, but develop is still out of sync with master. We'll have to fix this for real. If you guys think this is too ugly and we need to fix it for realz before the release, give me ideas. Thanks!

Changes

Ccf 9171 memory vcpu mismatch (#155)

• don't use default command line params for memory and vcpus

• 0.12.9

Bump lodash for vunerabilities
CCF-9252 update generator for linux

CCF-9376 update generator version to 0.3.18 (#163)

CCF-9286: return instanceId in the message when promoting a snapshot … (#162)

• CCF-9286: return instanceId in the message when promoting a snapshot to an environment that was being returned by the api response but not getting included in the cli response

• updated message with review comments

fixing undefined error when promoting a snapshot to an environment, instanceId is under response.message.instanceId (#164)

working recursive upload of directory (#165)

• working recursive upload of directory

• 0.12.12

Remove cortex-processors commands (#166)

Add agents list-snapshot-instances (#168)

Chunk directory upload (#169)

• use sequential chunks of files to upload

• 0.12.13

Fix invalid query param on list snap instances (#170)

Updated list-services command to display the parameter names/types as well (#171)

CCF-9783 reverting changes to agent and catalog (#173)

Remove --timeout option from actions deploy (#175)

Ccf 9955 configure url (#176)

• add protocol prefix if one is missing

• 0.12.14

Return error message from content upload properly

Bump generator-cortex to pick up with_type change

created template checklist as POC

updated pull_request_template

Update pull_request_template.md

Checklist:

Please check you fulfill ALL of the relevant checkboxes

• Notified docs of any potential USER-facing changes
• Added short description of the change - with relevant motivation and context.
• Branch has the ticket number in its name (along with a ticket summary)
• Commented the code, particularly in hard-to-understand areas
• Added tests that prove my fix is effective or that my feature works
• Ran npm test and it passes
• Changes generate no new warnings