FASTTRACK: Merge #26

Fix #25 and release updates Document and copyright header changes only
nasa · Dec 19, 2019 · b27d7e8 · b27d7e8
2 parents ce379c6 + 447f59a
commit b27d7e8
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/LICENSE-18128-Apache-2_0.pdf b/LICENSE-18128-Apache-2_0.pdf
diff --git a/README.md b/README.md
@@ -6,13 +6,14 @@ This lab application is a non-flight utility to send commands to the cFS Bundle.
 
 ci_lab is a simple command uplink application that accepts CCSDS telecommand packets over a UDP/IP port. It does not provide a full CCSDS Telecommand stack implementation.
 
-## Release Notes
+## Version Notes
 
-- 2.3.0:
+- **2.3.0 OFFICIAL RELEASE**:
   - Minor updates (see #12)
   - Not backwards compatible with OSAL 4.2.1
+  - Released as part of cFE 6.7.0, Apache 2.0
 - **2.2.0a OFFICIAL RELEASE**:
-  - Released as part of cFE 6.6.0a under the Apache 2.0 license, see [LICENSE](LICENSE-18128-Apache-2_0.pdf).
+  - Released as part of cFE 6.6.0a, Apache 2.0
 
 ## Known issues
 

diff --git a/fsw/mission_inc/ci_lab_perfids.h b/fsw/mission_inc/ci_lab_perfids.h
@@ -1,6 +1,6 @@
 /************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.

diff --git a/fsw/platform_inc/ci_lab_msgids.h b/fsw/platform_inc/ci_lab_msgids.h
@@ -1,6 +1,6 @@
 /************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.

diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.

diff --git a/fsw/src/ci_lab_app.h b/fsw/src/ci_lab_app.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.

diff --git a/fsw/src/ci_lab_defs.h b/fsw/src/ci_lab_defs.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.

diff --git a/fsw/src/ci_lab_events.h b/fsw/src/ci_lab_events.h
@@ -1,6 +1,6 @@
 /************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.

diff --git a/fsw/src/ci_lab_msg.h b/fsw/src/ci_lab_msg.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.

diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h
@@ -1,6 +1,6 @@
 /************************************************************************
 **
-**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**      GSC-18128-1, "Core Flight Executive Version 6.7"
 **
 **      Copyright (c) 2006-2019 United States Government as represented by
 **      the Administrator of the National Aeronautics and Space Administration.