From da695db7daaf3ca417662b81c5b9ea48c67be78f Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 10 Jun 2020 21:26:01 -0400 Subject: [PATCH] Integration Candidate: 2020-05-27 (#96) * Fix #92 - Update lgtm.yml file to exclude Ui files * Update sample_app to reflect HOTFIX * Update cFS-GroundSystem to reflect HOTFIX * Add osal PR#495 to fix race condition * Update sample_app to reflect unit test HOTFIX * Update submodules to master for IC-2020-05-27 Co-authored-by: lbleier-GSFC Co-authored-by: Jacob Hageman --- .lgtm.yml | 1 + apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index d794485f8..01e3d8a8a 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -10,6 +10,7 @@ extraction: version: "3" index: include: "tools/cFS-GroundSystem" + exclude: "tools/cFS-GroundSystem/**/Ui_*" cpp: index: build_command: diff --git a/apps/ci_lab b/apps/ci_lab index a5891633b..e4a1bb833 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit a5891633bd95edaf3314b98cbab38b1426fd6873 +Subproject commit e4a1bb83357c25fac89a5c7fc240a925ecd66094 diff --git a/apps/sample_app b/apps/sample_app index 4b6d54ff6..4a4b8e281 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 4b6d54ff6216cc8dd6cceab1dbcd1db21f456f69 +Subproject commit 4a4b8e281802f244a2facdcb3c32238751c678f3 diff --git a/apps/to_lab b/apps/to_lab index dd8d2f72a..00f703e94 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit dd8d2f72a493f0b09948c12fd9fcaeea2d8b03c3 +Subproject commit 00f703e94ab3b8846b7f7cf89ad309f1d7e31365 diff --git a/cfe b/cfe index d217ca39f..ad2190af9 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit d217ca39f1de74695f0d4e0eb427f90fbe8b1156 +Subproject commit ad2190af9a2b40c9b9d0f3b88f601e931ad4059d diff --git a/osal b/osal index 360438765..07fd02282 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 360438765d7eb83a9e7e15571cda89786f0d8330 +Subproject commit 07fd02282b251f8065d85aaffb2a3c2bf9d0e6f9 diff --git a/psp b/psp index 39760aa35..4703df284 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 39760aa35b5bfa2cd58c697af481ec0dbeb7a50a +Subproject commit 4703df284632415b8053bf16ce93f89f9a78eb31 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 3263506ae..52f706bf5 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 3263506ae0501eb1d7b9aa6e401ed018bb1f5ffa +Subproject commit 52f706bf50741da2f0523f340ec6d7e1e27e9ff9