Commit Graph

199 Commits

Author SHA1 Message Date
Robin Müller 2f90e12179
Merge remote-tracking branch 'upstream/development' into important_bugfix_linux_get_uptime 2023-03-15 12:32:25 +01:00
Robin Müller 47503824d7
health service fixes and changelog 2023-03-15 12:27:39 +01:00
Robin Müller 1f36c082ef
bugfix and changelog for Linux getUptime 2023-03-15 12:21:50 +01:00
Ulrich Mohr dc7afc5415 Version bump, CHANGELOG update, format 2023-02-23 13:38:24 +01:00
Ulrich Mohr 61562b18ab Merge branch 'development' into add_health_service_announce_all 2023-02-23 12:56:12 +01:00
Ulrich Mohr 3562bf11b9 CHANGELOG update 2023-02-10 11:06:46 +01:00
Ulrich Mohr fffb2b61e5 release check helper 2023-02-10 11:06:30 +01:00
Ulrich Mohr dfb1633f00 Merge branch 'development' into mode_service_fixes 2023-02-09 13:46:19 +01:00
Ulrich Mohr 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
Ulrich Mohr 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
Robin Müller f1b0ca7cff
add PR link 2023-02-08 21:26:37 +01:00
Robin Müller 000df85556
bump changelog 2023-02-08 21:24:00 +01:00
Robin Müller a419806a05
Merge remote-tracking branch 'upstream/development' into mode_service_fixes 2023-02-08 09:33:13 +01:00
Robin Müller 6445debfa1
bump changelog 2023-02-08 09:24:55 +01:00
Robin Müller 5adf89b911
changelog update 2023-02-07 12:41:42 +01:00
Robin Müller 3ed49dbae3
Merge remote-tracking branch 'upstream/development' into empty_cds_short_ctor 2023-02-07 12:24:02 +01:00
Robin Müller 46230e6c6d
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 2023-02-07 12:11:29 +01:00
Robin Müller b22d439300
bump changelog 2023-02-07 12:10:11 +01:00
Steffen Gaisser d9da55fdab Merge branch 'development' into add_health_service_announce_all 2023-02-06 15:03:52 +01:00
Steffen Gaisser 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
Steffen Gaisser c0e5d1eb99 Merge branch 'development' into tcp_server_reuseaddr_reusesocket 2023-02-06 14:34:52 +01:00
Robin Müller 3bc5d4a2e0
Merge remote-tracking branch 'upstream/development' into mgm_handler_small_fix 2023-02-06 14:25:33 +01:00
Robin Müller b1e9dd9e4a
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 2023-02-06 14:24:38 +01:00
Robin Müller 4374c7c4f4
changelog 2023-02-03 16:01:56 +01:00
Robin Müller 0f811777a7
changelog update 2023-02-01 20:49:53 +01:00
Robin Müller 1f88c006d9
update changelog 2023-02-01 18:42:09 +01:00
Robin Müller 7e94baceef
service 9 update
- fix time info event
- add time dump subservice
2023-02-01 18:39:23 +01:00
Robin Müller 61df451dd8
update changelog 2023-02-01 17:41:47 +01:00
Robin Müller eb223dae88
bump changelog 2023-01-30 14:20:28 +01:00
Robin Müller b646717a76
bump changelog 2023-01-30 14:11:00 +01:00
Robin Müller 97c629ad84
update changelog 2023-01-13 10:53:36 +01:00
Robin Müller 50930b41ba
Merge remote-tracking branch 'upstream/development' into mueller/dle_parser 2022-11-28 08:27:24 +01:00
Steffen Gaisser 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
Steffen Gaisser 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
Steffen Gaisser 16ffa00155 Merge branch 'development' into mueller/dle_parser 2022-11-21 15:28:34 +01:00
Steffen Gaisser 0958c3a00e Merge branch 'development' into mueller/health_helper_bugfix 2022-11-21 15:24:51 +01:00
Steffen Gaisser 3b0fed733f Merge branch 'development' into mueller/uio_mapper_handle_symlinks 2022-11-21 15:23:15 +01:00
Robin Müller dec7db3ae2
Merge remote-tracking branch 'upstream/development' into mueller/accepts_tm_if_adaptions 2022-11-21 15:00:06 +01:00
Robin Müller b85ca64690
update changelog 2022-11-15 11:48:28 +01:00
Robin Müller 3bc3da5a8d
update changelog 2022-11-15 11:47:26 +01:00
Robin Müller f8c07ec9cf
update changelog 2022-11-15 11:46:43 +01:00
Robin Müller 8199b8f359
bump changelog 2022-11-15 11:45:39 +01:00
Robin Müller cbc8dbcdd4
update changelog 2022-11-15 11:44:45 +01:00
Robin Müller ab9b6c8c89
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-11-14 14:51:33 +01:00
Robin Müller f715b65d6e
Merge remote-tracking branch 'upstream/development' into mueller/local-pool-update-remove-ignore-fault-arg 2022-10-28 10:06:04 +02:00
Robin Müller c11af63015
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-10-28 10:04:21 +02:00
Steffen Gaisser 955579c856 Merge branch 'development' into mueller/refactor-accepts-tc-tm-if 2022-10-24 14:57:38 +02:00
Steffen Gaisser 73e313c35b Merge branch 'development' into mueller/local-pool-update 2022-10-24 14:35:24 +02:00
Robin Müller dd2f42d22b Merge branch 'development' into mueller/local-pool-update 2022-10-24 14:34:56 +02:00
Robin Müller d8a4675842
bump changelog 2022-10-24 14:30:14 +02:00