|
|
62f725beea
|
bump changelog and version
EIVE/eive-obsw/pipeline/pr-main This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-07-04 11:13:26 +02:00 |
|
|
|
5b0f1efefd
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 15:48:00 +02:00 |
|
|
|
95121b5120
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 15:47:21 +02:00 |
|
|
|
f50682b56a
|
Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #256
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:23:19 +02:00 |
|
|
|
581423a40e
|
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-25 10:09:24 +02:00 |
|
|
|
e1ed532f91
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-25 10:01:53 +02:00 |
|
|
|
7646b683b2
|
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 09:59:14 +02:00 |
|
|
|
43fc1ab780
|
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 09:57:34 +02:00 |
|
|
|
3eb8525419
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-24 15:22:45 +02:00 |
|
|
|
3e9b337e31
|
changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-24 01:14:47 +02:00 |
|
|
|
a1d2ec3db4
|
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-23 22:24:28 +02:00 |
|
|
|
2f155d8350
|
bump changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-23 18:39:13 +02:00 |
|
|
|
10e075efaf
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-23 17:52:44 +02:00 |
|
|
|
2fa1061c65
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-16 15:11:24 +02:00 |
|
|
|
b5821ec6dc
|
changelog update
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-13 09:35:47 +02:00 |
|
|
|
da4d3e4891
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-12 20:47:19 +02:00 |
|
|
|
51466e68d7
|
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-12 14:11:46 +02:00 |
|
|
|
dd67191044
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-12 14:02:15 +02:00 |
|
|
|
4120befef0
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-11 01:50:49 +02:00 |
|
|
|
604dbea372
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-11 00:28:57 +02:00 |
|
|
|
a4e36ebdb6
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-07 12:55:48 +02:00 |
|
|
|
9884ea225e
|
update CHANGELOG
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-07 12:54:25 +02:00 |
|
|
|
1c2f80f48e
|
Merge branch 'develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-06 10:11:32 +02:00 |
|
|
|
355ca27d31
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-06 08:58:31 +02:00 |
|
|
|
22060b9b16
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-06 01:12:07 +02:00 |
|
|
|
a945b3cae0
|
Merge remote-tracking branch 'origin/develop' into mueller/install-catch2-docker
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 20:19:53 +02:00 |
|
|
|
e98563d834
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-05 19:51:25 +02:00 |
|
|
|
a2a7313016
|
Merge remote-tracking branch 'origin/develop' into mueller/rename-sus
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 19:47:17 +02:00 |
|
|
|
8f9d84c293
|
Merge remote-tracking branch 'origin/develop' into mueller/ci-cd-build-host-and-unittest-by-default
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 19:42:24 +02:00 |
|
|
|
0c82d06ec4
|
Merge remote-tracking branch 'origin/develop' into mueller/rename-sus
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 19:41:36 +02:00 |
|
|
|
cc662738f2
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-05 16:55:51 +02:00 |
|
|
|
4445ac34ca
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 16:49:10 +02:00 |
|
|
|
a2e22302fb
|
update changelog
|
2022-05-04 17:46:01 +02:00 |
|
|
|
3458c272ad
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-04 16:47:49 +02:00 |
|
|
|
1508a1e147
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-04 16:43:31 +02:00 |
|
|
|
a6c6325d41
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-04 16:41:08 +02:00 |
|
|
|
2cf1da5478
|
Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-04 14:51:55 +02:00 |
|
|
|
e06f459333
|
changelog correction
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-04 14:43:27 +02:00 |
|
|
|
535da53093
|
Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-04 14:34:07 +02:00 |
|
|
|
afaeca7cf7
|
update changelog
EIVE/eive-obsw/pipeline/head Build started...
|
2022-05-04 14:14:24 +02:00 |
|
|
|
e8e3138fba
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 16:05:01 +02:00 |
|
|
|
3b40e622fe
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 16:02:45 +02:00 |
|
|
|
06df558be0
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 16:01:09 +02:00 |
|
|
|
08046ef621
|
Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 15:57:01 +02:00 |
|
|
|
8b4d56cc0d
|
changelog improvements
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 12:51:34 +02:00 |
|
|
|
4fdeccc3a8
|
update CHANGELOG
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 12:48:30 +02:00 |
|
|
|
4149b08f3a
|
update CHANGELOG
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 11:56:25 +02:00 |
|
|
|
08d7b3b859
|
update changelog
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-03 11:34:47 +02:00 |
|
|
|
456dac6afd
|
SHM and socket readout working now
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-03 11:33:07 +02:00 |
|
|
|
7db0872ee3
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-02 12:49:53 +02:00 |
|
|
|
bab8412f10
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-02 12:41:45 +02:00 |
|
|
|
3d817363e6
|
fixed conflicts
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-04-29 18:26:20 +02:00 |
|
|
|
1527b60fd6
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-28 18:26:34 +02:00 |
|
|
|
cb47667d01
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-28 17:56:33 +02:00 |
|
|
|
3a03d6ca55
|
update CHANGELOG
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-28 17:56:06 +02:00 |
|
|
|
e16f5e68d6
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-28 17:54:47 +02:00 |
|
|
|
6d326137fb
|
Merge pull request 'OBSW Config in file update' (#225) from mueller/obsw-config-infile-update into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #225
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-04-28 17:15:37 +02:00 |
|
|
|
40b84b0576
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-28 13:08:19 +02:00 |
|
|
|
ab85ebf83e
|
update CHANGELOG
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-28 11:37:06 +02:00 |
|
|
|
9f3a56e5e6
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
|
2022-04-23 12:37:25 +02:00 |
|
|
|
f421fd4dde
|
Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler
|
2022-04-23 12:30:45 +02:00 |
|
|
|
ea139d0657
|
added new revision
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2022-04-22 16:16:25 +02:00 |
|
|
|
88249cd5be
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-22 11:07:40 +02:00 |
|
|
|
4a5ea4450f
|
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-22 10:59:43 +02:00 |
|
|
|
2c491b27c0
|
update CHANGELOG
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2022-04-21 14:21:02 +02:00 |
|
|
|
ae2cd52087
|
add changelog
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-21 14:18:41 +02:00 |
|
