upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-09 08:55:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Remove unused variable

Browse source
This commit is contained in:
Jeff Mitchell 2018-08-09 16:47:58 -04:00
parent ad9d4b0aad
commit b915e47caa
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vault/identity_store_entities.go
View file

@ -485,7 +485,6 @@ func (i *IdentityStore) mergeEntity(txn *memdb.Txn, toEntity *identity.Entity, f
return errors.New("entity id to merge to is invalid"), nil
}
var conflictErrors error
for _, fromEntityID := range fromEntityIDs {
if fromEntityID == toEntity.ID {
return errors.New("to_entity_id should not be present in from_entity_ids"), nil
@ -542,10 +541,6 @@ func (i *IdentityStore) mergeEntity(txn *memdb.Txn, toEntity *identity.Entity, f
}
}
if conflictErrors != nil && !force {
return conflictErrors, nil
}
// Update MemDB with changes to the entity we are merging to
err := i.MemDBUpsertEntityInTxn(txn, toEntity)
if err != nil {