Skip to content

Commit

Permalink
Revert "imagestatus: Remove supervisor related errors from imagestatu…
Browse files Browse the repository at this point in the history
…s proto"

This reverts commit b0050d0.

Reason for revert: Merge conflict in generated commits

Change-Id: Ibfe4479e272afe183b23bc1883dacaf071c3bd16
  • Loading branch information
JamesZ0303 committed Nov 8, 2023
1 parent 8450464 commit 7344bae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions arista/imagestatus.v1/imagestatus-changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# New entries go on top.

Changes:
- date: 2023-10-18
description: Remove supervisor related errors
version: 1.2.1
cvaas: true
- date: 2023-09-20
description: Add embedded information to extensions
version: 1.2.0
Expand Down
4 changes: 2 additions & 2 deletions arista/imagestatus.v1/imagestatus.proto
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,10 @@ enum ErrorCode {
ERROR_CODE_GET_PROPOSED_IMAGE_INFO_FAILED = 5;
// ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_ACTIVE_SUPERVISOR_FAILED represents case where we
// fail to get running image information from an active supervisor.
ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_ACTIVE_SUPERVISOR_FAILED = 6 [deprecated=true];
ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_ACTIVE_SUPERVISOR_FAILED = 6;
// ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_PEER_SUPERVISOR_FAILED represents case when we
// fail to get information from peer supervisor.
ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_PEER_SUPERVISOR_FAILED = 7 [deprecated=true];
ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_PEER_SUPERVISOR_FAILED = 7;
// ERROR_CODE_EOS_TA_ARCHITECTURE_INCOMPATIBLE represents the case where EOS architecture and
// TerminAttr architecture are incompatible.
ERROR_CODE_EOS_TA_ARCHITECTURE_INCOMPATIBLE = 8;
Expand Down

0 comments on commit 7344bae

Please sign in to comment.