Commit Graph

4066 Commits

Author SHA1 Message Date
a59eec553a Merge branch 'master' into lemur_vault_plugin 2019-03-18 15:21:18 -07:00
fed6f661c7 Merge branch 'master' into ghjaramos/master 2019-03-18 15:21:10 -07:00
5c11a2941c Merge pull request #2713 from hosseinsh/up-reqs-03182019
updating requirements
2019-03-18 15:20:48 -07:00
dbd948be6e updating requirements 2019-03-18 12:50:18 -07:00
9e5496b484 Update schemas.py 2019-03-15 10:19:25 +01:00
f7452e8379 Parse DNSNames from CSR into Lemur Certificate 2019-03-15 09:29:23 +01:00
157db684c3 Merge branch 'master' into lemur_vault_plugin 2019-03-14 11:09:01 -04:00
cfe0595918 Merge pull request #2689 from castrapel/skip_duplicate_tasks
Skip a task if similar task already active
2019-03-12 15:54:46 -07:00
c445297357 Update celery.py 2019-03-12 15:41:24 -07:00
f38e5b0879 Update celery.py 2019-03-12 15:29:04 -07:00
1a5a91ccc7 Update celery.py 2019-03-12 15:11:13 -07:00
3b3faa66f4 Merge branch 'master' into skip_duplicate_tasks 2019-03-12 14:53:42 -07:00
d220e9326c Skip a task if similar task already active 2019-03-12 14:45:43 -07:00
9ff789ab06 Merge pull request #2336 from intgr/verify-cert-chain
Check that stored certificate chain matches certificate
2019-03-11 18:06:06 -07:00
57d3f3d5a5 Merge branch 'master' into lemur_vault_plugin 2019-03-08 07:08:56 -05:00
f1c09a6f8f fixed comments 2019-03-07 15:58:34 -05:00
93ce259fb2 Merge branch 'master' into verify-cert-chain 2019-03-07 12:46:19 -08:00
bd27932783 Merge pull request #2529 from rmoesbergen/allow-cert-deletion
Implement ALLOW_CERT_DELETION setting
2019-03-07 12:45:53 -08:00
7b0a3cf781 Merge branch 'lemur_vault_plugin' of github.com:/alwaysjolley/lemur into lemur_vault_plugin 2019-03-07 15:42:40 -05:00
752c9a086b fixing error handling and better data formating 2019-03-07 15:41:29 -05:00
92b60b279a Merge branch 'master' into verify-cert-chain 2019-03-06 11:15:32 -08:00
b8d3a4f9aa Update requirements.in 2019-03-06 11:13:34 -08:00
43b1d6217a Merge branch 'master' into allow-cert-deletion 2019-03-06 10:59:33 -08:00
98ece58342 Merge branch 'master' into lemur_vault_plugin 2019-03-06 10:59:03 -08:00
b5d255d7c9 Merge pull request #2646 from Netflix/2636-config-ignore
Ensuring that configs passed via the command line are respected.
2019-03-06 10:58:42 -08:00
f974e29cc9 Merge branch 'master' into verify-cert-chain 2019-03-06 09:36:10 -08:00
45cb0f0513 Merge branch 'master' into allow-cert-deletion 2019-03-06 09:35:10 -08:00
4904e6e223 Merge branch 'master' into lemur_vault_plugin 2019-03-06 12:06:10 -05:00
cc6d53fdeb Ensuring that configs passed via the command line are respected. 2019-03-05 15:39:37 -08:00
721fb8ec70 Merge pull request #2639 from castrapel/really_downgrade_kombu
Downgrade Kombu for real this time
2019-03-05 09:46:36 -08:00
077ae1eedd Downgrade Kombu for real this time 2019-03-05 09:45:59 -08:00
b878c7e2db Merge pull request #2638 from castrapel/downgrade_kombu2
downgrade kombu
2019-03-05 07:50:23 -08:00
20ac4bd3dd downgrade kombu 2019-03-05 07:34:30 -08:00
a1cb8ee266 fixing lint 2019-03-05 07:37:04 -05:00
880eaad6cb Merge branch 'lemur_vault_plugin' of github.com:/alwaysjolley/lemur into lemur_vault_plugin 2019-03-05 07:22:18 -05:00
4a027797e0 fixing linting issues 2019-03-05 07:19:22 -05:00
54ad3ba777 Merge branch 'master' into verify-cert-chain 2019-03-04 17:55:36 -08:00
c9bcd29082 Merge branch 'master' into lemur_vault_plugin 2019-03-04 17:55:00 -08:00
130688252a Merge pull request #2630 from castrapel/relax_search
Relax search; update requirements
2019-03-04 11:14:16 -08:00
dd2900bdbc Relax search;update requirements 2019-03-04 10:04:06 -08:00
10cec063c2 Check that stored certificate chain matches certificate
Similar to how the private key is checked.
2019-03-04 17:10:59 +02:00
20518bc377 Merge branch 'master' into lemur_vault_plugin 2019-03-01 09:58:43 -05:00
5d2f603c84 renamed vault destination plugin to avoid conflict with vault pki plugin 2019-03-01 09:49:52 -05:00
63de8047ce Return 'already deleted' instead of 'not found' when cert has already been deleted 2019-02-27 09:38:25 +01:00
a9735e129c Merge branch 'master' into allow-cert-deletion 2019-02-27 09:28:48 +01:00
930af17802 Merge pull request #2588 from hosseinsh/fixing-signature-verify-ecc
Fixing signature verify ecc
2019-02-26 17:12:21 -08:00
658c58e4b6 clarifying comments 2019-02-26 17:04:43 -08:00
9dbae39604 updating cryptography API call, to create right signing algorithm object. 2019-02-26 16:42:26 -08:00
16a18cc4b7 adding more edge test cases for EC-certs 2019-02-26 16:42:26 -08:00
aec7c7b0bc Merge branch 'master' into fixing-signature-verify-ecc 2019-02-26 09:28:48 -08:00