Merge pull request #722 from calvinmclean/v36-4

Create v36-4 release

CHANGELOG.md

@@ -24,19 +24,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
   - <in case of vulnerabilities>
 -->
 
-## [Unreleased](https://github.com/cyverse/atmosphere/compare/v36-3...HEAD) - YYYY-MM-DD
+## [Unreleased](https://github.com/cyverse/atmosphere/compare/v36-4...HEAD) - YYYY-MM-DD
+
+
+## [v36-4](https://github.com/cyverse/atmosphere/compare/v36-3...v36-4) - 2019-09-09
 ### Security
   - Update to Django 1.11.23
     ([#718](https://github.com/cyverse/atmosphere/pull/718))
-  - Move tas timeout into driver, only apply timeout to an instance of a driver 
+  - Move tas timeout into driver, only apply timeout to an instance of a driver
     ([#687](https://github.com/cyverse/atmosphere/pull/687))
 
 ### Fixed
   - Upgrade to rtwo 0.5.25 to fix errors caused by deleted source volume
     ([#721](https://github.com/cyverse/atmosphere/pull/721))
 
 
-## [v36-3](https://github.com/cyverse/atmosphere/compare/v36-2...HEAD) - 2019-08-08
+## [v36-3](https://github.com/cyverse/atmosphere/compare/v36-2...v36-3) - 2019-08-08
 ### Fixed
   - Fix uncommon bug with `machine_request.get_access_list()`
     ([#713](https://github.com/cyverse/atmosphere/pull/713))