Merge branch 'master' into dod_branch_labels

This commit is contained in:
andrewdds
2018-08-20 14:09:46 -04:00
committed by GitHub
8 changed files with 196 additions and 4 deletions

View File

@@ -77,7 +77,7 @@ class CRLCache():
store.add_cert(ca)
self.log_info("STORE ID: {}. Adding CA with subject {}".format(id(store), ca.get_subject()))
if issuer == ca.get_subject():
if issuer == ca.get_issuer():
# i.e., it is the root CA and we are at the end of the chain
return store

View File

@@ -89,11 +89,13 @@ class RequestForm(ValidatedForm):
data_transfers = SelectField(
description="How much data is being transferred to the cloud?",
choices=DATA_TRANSFER_AMOUNTS,
validators=[Required()],
)
expected_completion_date = SelectField(
description="When do you expect to complete your migration to the JEDI Cloud?",
choices=COMPLETION_DATE_RANGES,
validators=[Required()],
)
cloud_native = RadioField(