Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2016-01-22 18:40:14 -05:00
commit c28e1c76e0

View file

@ -64,7 +64,6 @@ public class KeyDefinition extends SimpleResourceDefinition {
static final ObjectTypeAttributeDefinition KEY_STORE =
ObjectTypeAttributeDefinition.Builder.of(Constants.Model.KEY_STORE,
KeyStoreDefinition.ALL_ATTRIBUTES)
.setAllowNull(false)
.build();
static final SimpleAttributeDefinition[] ATTRIBUTES = {SIGNING, ENCRYPTION};