Commit Graph

231 Commits

Author SHA1 Message Date
e4fd424d66
Merge branch 'possible_tc_sched_fixes' into develop 2023-02-09 18:25:44 +01:00
341a66c265
changelog 2023-02-09 18:22:00 +01:00
dfb1633f00 Merge branch 'development' into mode_service_fixes 2023-02-09 13:46:19 +01:00
5f7172e130 Merge pull request 'TCP/IP TMTC bridge memory leak fixes' (#737) from eive/fsfw:possible_tcpip_bridge_fixes into development
Reviewed-on: fsfw/fsfw#737
2023-02-09 12:15:45 +01:00
0c6465cd95 Merge pull request 'time stamper empty ctor' (#730) from eive/fsfw:empty_cds_short_ctor into development
Reviewed-on: fsfw/fsfw#730
2023-02-09 11:45:49 +01:00
6ce80ea6c5
Merge branch 'possible_tcpip_bridge_fixes' into develop 2023-02-08 21:27:26 +01:00
f1b0ca7cff
add PR link 2023-02-08 21:26:37 +01:00
000df85556
bump changelog 2023-02-08 21:24:00 +01:00
a419806a05
Merge remote-tracking branch 'upstream/development' into mode_service_fixes 2023-02-08 09:33:13 +01:00
6445debfa1
bump changelog 2023-02-08 09:24:55 +01:00
84dc7ac0ce
bump changelog 2023-02-08 01:31:32 +01:00
5adf89b911
changelog update 2023-02-07 12:41:42 +01:00
69c94645df
add back HAL section 2023-02-07 12:36:01 +01:00
37e850c5a7
use upstream changelog 2023-02-07 12:31:19 +01:00
3ed49dbae3
Merge remote-tracking branch 'upstream/development' into empty_cds_short_ctor 2023-02-07 12:24:02 +01:00
06e30684fe
Merge remote-tracking branch 'upstream/development' into develop 2023-02-07 12:14:31 +01:00
46230e6c6d
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 2023-02-07 12:11:29 +01:00
b22d439300
bump changelog 2023-02-07 12:10:11 +01:00
8e0e57714d Merge pull request 'allow using SO_REUSEADDR and SO_REUSEPORT on TCP server' (#722) from eive/fsfw:tcp_server_reuseaddr_reusesocket into development
Reviewed-on: fsfw/fsfw#722
2023-02-06 14:45:40 +01:00
c0e5d1eb99 Merge branch 'development' into tcp_server_reuseaddr_reusesocket 2023-02-06 14:34:52 +01:00
3bc5d4a2e0
Merge remote-tracking branch 'upstream/development' into mgm_handler_small_fix 2023-02-06 14:25:33 +01:00
b1e9dd9e4a
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 2023-02-06 14:24:38 +01:00
38789e053b
Merge branch 'bugfix_dhb_set_datapool_entries_invalid' into develop 2023-02-03 16:05:29 +01:00
4374c7c4f4
changelog 2023-02-03 16:01:56 +01:00
3250bbf269
changelog update 2023-02-02 18:34:24 +01:00
acfc1cbf21 bump changelog 2023-02-02 18:31:40 +01:00
01cc619e67
Merge branch 'bugfix_pus_packets_seq_flags' into develop 2023-02-01 20:52:08 +01:00
0f811777a7
changelog update 2023-02-01 20:49:53 +01:00
bd586f6564 Merge branch 'updates_fixes_pus_time_service' into develop 2023-02-01 18:42:18 +01:00
1f88c006d9
update changelog 2023-02-01 18:42:09 +01:00
7e94baceef
service 9 update
- fix time info event
- add time dump subservice
2023-02-01 18:39:23 +01:00
7ee83e4e5d
service 9 update
- fix time info event
- add time dump subservice
2023-02-01 18:10:07 +01:00
64787f85ca update changelog 2023-02-01 17:42:06 +01:00
eb223dae88
bump changelog 2023-01-30 14:20:28 +01:00
b646717a76
bump changelog 2023-01-30 14:11:00 +01:00
accaf855ee Merge remote-tracking branch 'upstream/service_11_bugfixes' into develop 2023-01-13 11:19:17 +01:00
75fa7caf25
Merge remote-tracking branch 'upstream/development' into develop 2023-01-13 11:19:09 +01:00
97c629ad84
update changelog 2023-01-13 10:53:36 +01:00
2643ff194c
Merge remote-tracking branch 'upstream/development' into develop 2022-11-28 08:34:04 +01:00
50930b41ba
Merge remote-tracking branch 'upstream/development' into mueller/dle_parser 2022-11-28 08:27:24 +01:00
d6ee2ed400 Merge pull request 'AcceptsTelemetryIF tweaks' (#712) from eive/fsfw:mueller/accepts_tm_if_adaptions into development
Reviewed-on: fsfw/fsfw#712
2022-11-21 16:30:43 +01:00
f2150ff9c2 Merge pull request 'only delete table entry if not nullptr' (#710) from eive/fsfw:mueller/health_helper_bugfix into development
Reviewed-on: fsfw/fsfw#710
2022-11-21 16:24:13 +01:00
16ffa00155 Merge branch 'development' into mueller/dle_parser 2022-11-21 15:28:34 +01:00
0958c3a00e Merge branch 'development' into mueller/health_helper_bugfix 2022-11-21 15:24:51 +01:00
3b0fed733f Merge branch 'development' into mueller/uio_mapper_handle_symlinks 2022-11-21 15:23:15 +01:00
dec7db3ae2
Merge remote-tracking branch 'upstream/development' into mueller/accepts_tm_if_adaptions 2022-11-21 15:00:06 +01:00
b85ca64690
update changelog 2022-11-15 11:48:28 +01:00
3bc3da5a8d
update changelog 2022-11-15 11:47:26 +01:00
f8c07ec9cf
update changelog 2022-11-15 11:46:43 +01:00
8199b8f359
bump changelog 2022-11-15 11:45:39 +01:00