FASTTRACK: Merge #13

Fix #12, Release prep Document and copyright header changes only
nasa · Dec 19, 2019 · e86d374 · e86d374
2 parents e03d2bb + 0d1204a
commit e86d374
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 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,14 +6,13 @@ This sample library is a non-flight example library implementation for the cFS B
 
 sample_lib implements SAMPLE_Function, as an example for how to build and link a library in cFS.
 
-## Release Notes
+## Version Notes
 
-- 1.1.0:
+- **1.1.0 OFFICIAL RELEASE**:
   - Minor updates (see https://github.com/nasa/sample_lib/pull/6)
+  - Released as part of cFE 6.7.0, Apache 2.0
 - **1.0.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).
-
-Note the old GSFC Build toolset is deprecated (fsw/for_build/Makefile) in favor of cmake (CMakeLists.txt)
+  - Released as part of cFE 6.6.0a, Apache 2.0
 
 ## Known issues
 

diff --git a/fsw/public_inc/sample_lib.h b/fsw/public_inc/sample_lib.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/sample_lib.c b/fsw/src/sample_lib.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/sample_lib_version.h b/fsw/src/sample_lib_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.