microsoft / xblock-azure-media-services

xblock-azure-media-services
Other
14 stars 19 forks source link

full merge from release to master #38

Closed sdolenc closed 7 years ago

sdolenc commented 7 years ago

What does this PR do? Please provide some context

full merge from release to master

Where should the reviewer start?

n/a. it's better to review it in parts by looking at the original PRs

How can this be manually tested? (brief repro steps)

n/a. see original PRs

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

n/a. required for a deployment

Definition of done:

Reminders BEFORE merging

  1. Get at least two approvals
  2. If you're merging from a feature branch into the development branch then "flatten" or "squash" commits
  3. If merging from the development branch into master (or porting changes from upstream) then use github's UI to get review feedback, but use the git command line interface to complete the actual merge.

Reminders AFTER merging

  1. Delete the remote feature branch
  2. Resolve relevant TFS items
  3. (reverse merge) If you merged from the development branch into master then check to see if there are any changes in master that can be merged down to the development branch (like hotfixes, etc). In this case, use github's UI for feedback and the git command line interface for the actual merge.