Merge pull request #7402 from hashicorp/jbardin/inc-state-serial

core: increment the state serial whenever we upgrade
This commit is contained in:
James Bardin 2016-06-28 19:26:19 -04:00 committed by GitHub
commit 20240c0e52
1 changed files with 3 additions and 0 deletions

View File

@ -1474,6 +1474,8 @@ func ReadState(src io.Reader) (*State, error) {
return nil, err
}
// increment the Serial whenever we upgrade state
v3State.Serial++
return v3State, nil
case 2:
v2State, err := ReadStateV2(jsonBytes)
@ -1485,6 +1487,7 @@ func ReadState(src io.Reader) (*State, error) {
return nil, err
}
v3State.Serial++
return v3State, nil
case 3:
v3State, err := ReadStateV3(jsonBytes)