Merge branch 'master' into training-inputs-doc-fix

Author: jeniyat

tests/integ/__init__.py

@@ -18,7 +18,7 @@
 import boto3
 
 DATA_DIR = os.path.join(os.path.dirname(__file__), "..", "data")
-TRAINING_DEFAULT_TIMEOUT_MINUTES = 20
+TRAINING_DEFAULT_TIMEOUT_MINUTES = 40
 TUNING_DEFAULT_TIMEOUT_MINUTES = 20
 TRANSFORM_DEFAULT_TIMEOUT_MINUTES = 20
 AUTO_ML_DEFAULT_TIMEMOUT_MINUTES = 60