eive/fsfw
15
1 Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update from upstream #94

Merged
meierj merged 12 commits from mueller/update-from-upstream into develop 2022-05-25 15:24:19 +02:00
Conversation 1 Commits 12 Files Changed 8
+101 -40
muellerr commented 2022-05-25 14:46:03 +02:00
Owner
Copy link
Copy source
No description provided.
muellerr added 12 commits 2022-05-25 14:46:06 +02:00
remove commented code 13cda86d23
Merge branch 'development' into mueller/tcp-server-cache-client-addr 5e62258aa6
Merge pull request 'cache the TCP client address now' (#630) from eive/fsfw:mueller/tcp-server-cache-client-addr into development 5a425a1c58 
Reviewed-on: fsfw/fsfw#630
Merge branch 'development' into mueller/tc-11-tweaks f288d5120d
afmt 34658ef7db
added 3 new subservices e60a665de4
added missing delete f7cde80088
return end iterator instead of crashing e59f1f26bf
Merge pull request 'PUS11 TC sched update and bugfixes' (#632) from mueller/tc-11-tweaks into development 261eea381e 
Reviewed-on: fsfw/fsfw#632
Merge branch 'development' into mueller/possible-fix-ccsds-distrib 7dddcdfd55
Merge pull request 'return end iterator instead of crashing' (#633) from mueller/possible-fix-ccsds-distrib into development c7cf8e710d 
Reviewed-on: fsfw/fsfw#633
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream c4fa7281ae
meierj approved these changes 2022-05-25 15:24:09 +02:00
meierj merged commit fbec1b3dc9 into develop 2022-05-25 15:24:19 +02:00
muellerr deleted branch mueller/update-from-upstream 2022-05-25 15:36:00 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
meierj
Labels
Clear labels
api change
API change
 breaking api change
API change which can break existing code
 bug
Something is not working
 documentation
Documentation
 duplicate
This issue or pull request already exists
 feature
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No labels
Milestone
No items
No Milestone
Assignees
Clear assignees
ahinkel (Andy Hinkel) jenkins_buildfix lkoester meggert (Marius Eggert) meierj (Jakob Meier) mkoller mkranz mohr (Ulrich Mohr) msenger (Mikael Senger) muellerr (Robin Müller) rschweigert steinertm (Michael Steinert) zinkj
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: eive/fsfw#94