Merge branch 'master' into reorg_docs

aaronmarkham · web-flow · commit d84ac0ca65ef · 2020-05-26T09:29:39.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## v1.60.0 (2020-05-25)
+
+### Features
+
+ * support TensorFlow training 2.2
+
+### Bug Fixes and Other Changes
+
+ * blacklist unknown xgboost image versions
+ * use format strings instead of os.path.join for S3 URI in S3Downloader
+
+### Documentation Changes
+
+ * consolidate framework version and image information
+
 ## v1.59.0 (2020-05-21)
 
 ### Features
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.59.1.dev0
+1.60.1.dev0
