incubator-airflow git commit: [AIRFLOW-1636] Add AWS and EMR connection type

[cr...@apache.org]

Repository: incubator-airflow
Updated Branches:
  refs/heads/master 65f3b468a -> afd927a25


[AIRFLOW-1636] Add AWS and EMR connection type

aws and emr connection types are not specified in models, so when you
update them the type gets cleared.  Since default ones are included
ootb, they should be added to the model as valid options.

Closes #2626 from dalupus/airflow-1636


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/afd927a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/afd927a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/afd927a2

Branch: refs/heads/master
Commit: afd927a256d8ff97e59b28a3caf81ac0bf0d07f3
Parents: 65f3b46
Author: Michael Crawford <da...@gmail.com>
Authored: Mon Sep 25 11:21:55 2017 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Mon Sep 25 11:21:59 2017 -0700

----------------------------------------------------------------------
 airflow/models.py | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/afd927a2/airflow/models.py
----------------------------------------------------------------------
diff --git a/airflow/models.py b/airflow/models.py
index 26ea798..32b7d7e 100755
--- a/airflow/models.py
+++ b/airflow/models.py
@@ -552,6 +552,8 @@ class Connection(Base, LoggingMixin):
         ('redis', 'Redis',),
         ('wasb', 'Azure Blob Storage'),
         ('databricks', 'Databricks',),
+        ('aws', 'Amazon Web Services',),
+        ('emr', 'Elastic MapReduce',),
     ]
 
     def __init__(