Merge branch 'master' into unittests-use-valid-certs

This commit is contained in:
Curtis 2018-08-07 07:45:45 -07:00 committed by GitHub
commit f9a7b97839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -90,7 +90,7 @@ class AuthoritiesList(AuthenticatedResource):
"owner": "secure@example.com", "owner": "secure@example.com",
"id": 43, "id": 43,
"description": "This is the ROOT certificate for the TestAuthority certificate authority." "description": "This is the ROOT certificate for the TestAuthority certificate authority."
} }],
"total": 1 "total": 1
} }
@ -136,7 +136,7 @@ class AuthoritiesList(AuthenticatedResource):
"sensitivity": "medium", "sensitivity": "medium",
"keyType": "RSA2048", "keyType": "RSA2048",
"plugin": { "plugin": {
"slug": "cloudca-issuer", "slug": "cloudca-issuer"
}, },
"name": "TimeTestAuthority5", "name": "TimeTestAuthority5",
"owner": "secure@example.com", "owner": "secure@example.com",
@ -148,6 +148,7 @@ class AuthoritiesList(AuthenticatedResource):
"names": [] "names": []
}, },
"custom": [] "custom": []
}
} }
**Example response**: **Example response**:
@ -499,6 +500,7 @@ class AuthorityVisualizations(AuthenticatedResource):
{"name": "MergeEdge", "size": 743} {"name": "MergeEdge", "size": 743}
] ]
} }
]
} }
]} ]}
""" """