microsoft / oxa-tools

Open edX on Azure Tools
MIT License
36 stars 103 forks source link

Hawthorn Updates #438

Closed eltoncarr closed 5 years ago

eltoncarr commented 5 years ago

What does this PR do? Please provide some context

Merge all changes related to Hawthorn release

Where should the reviewer start?

The collection of changes

How can this be manually tested? (brief repro steps and corpnet-URL with change)

N/A

What are the relevant TFS items? (list id numbers)

Definition of done:

Reminders DURING merge

  1. If you're merging from a short-term (feature) branch into a long-term branch (like dev, release, or master) then "Squash and merge" to keep our history clean.
  2. If merging from two longterm branches (like cherry picks from upstream, dev to release, etc) then "Create merge commit" to preserve individual commits.