Merge upstream and apply auto-formatter #63
muellerr
commented 2022-04-21 10:38:13 +02:00
Owner
No description provided.
muellerr
added 14 commits 2022-04-21 10:38:15 +02:00
6c1db8473b
get alternative reply from device command info
c05184e1c4
Merge branch 'development' into meier/alternativeReply
17771c0497
progagate reply returnvalue
afe006e234
Merge pull request 'Alternative reply ID activation' (#595) from meier/alternativeReply into development
fe739aa81a
Merge branch 'development' into mueller/propagate-pool-manage-retval
acc4c8d975
check serialize result as well
7761b66fe2
delete data from ipc store if reply fails
c0f80680ef
Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval
6aa54fe1d4
added missing empty implementation
c04ca704d2
Merge pull request 'progagate reply returnvalue' (#597) from eive/fsfw:mueller/propagate-pool-manage-retval into development
7c2e50b665
added related PR in changelog
b03a6684f9
Merge branch 'development' into mueller/small-stm32-hal-bugifx
5ac88f2b15
Merge pull request 'added missing empty implementation in STM32 SPI HAL' (#599) from mueller/small-stm32-hal-bugifx into development
b128ef9da9
Merge remote-tracking branch 'upstream/development' into merge-upstream
muellerr
requested review from meierj 2022-04-21 10:38:20 +02:00
muellerr
added a new dependency 2022-04-21 10:41:16 +02:00
#64 LIS3 handler nullptr check
meierj
approved these changes 2022-04-21 13:54:10 +02:00
meierj
merged commit 9798b6b4ab into eive/develop 2022-04-21 13:54:24 +02:00
meierj
referenced this issue from a commit 2022-04-21 13:54:27 +02:00
Merge pull request 'Merge upstream and apply auto-formatter' (#63) from merge-upstream into eive/develop
muellerr
deleted branch merge-upstream 2022-04-21 14:00:24 +02:00
No reviewers
Labels
No Label
api change
breaking api change
bug
documentation
duplicate
feature
help wanted
invalid
question
wontfix
No Milestone
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Blocks
#64 LIS3 handler nullptr check
eive/fsfw
Reference: eive/fsfw#63
Loading…
Reference in New Issue
No description provided.
Delete Branch "merge-upstream"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?