Merge pull request #1302 from nasa/integration-candidate

Bump to v7.0.0-rc4+dev120
nasa · Oct 4, 2022 · b8e9b83 · b8e9b83
2 parents fd6f92b + 0a1aee9
commit b8e9b83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Changelog
 
+### Development Build: v6.0.0-rc4+dev120
+- Fix #1300, do not set file permissions on UT assert outputs
+- See <https://github.com/nasa/osal/pull/1301>
+
 ### Development Build: v6.0.0-rc4+dev116
 - Use fstat and fchmod for TOCTOU Bug
 - Remove 'return;' from last line of void functions.

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   116
+#define OS_BUILD_NUMBER   120
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*