Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync v3 with v2 staging #730

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Sync v3 with v2 staging #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to the ZSS package will be documented in this file.

## `3.0.0`
- Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#726)
- Bugfix: Support cross-memory server parameters longer than 128 characters (#684)
- Enhancement: Expose new cross-memory server's functions in dynlink (#684)

## `2.18.0`
- Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEBUG instead of INFO.(#719)
Expand Down
2 changes: 2 additions & 0 deletions c/zis/stubinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@
stubVector[ZIS_STUB_CMGETLOG] = (void*)cmsGetPCLogLevel;
stubVector[ZIS_STUB_CMGETSTS] = (void*)cmsGetStatus;
stubVector[ZIS_STUB_CMMKSNAM] = (void*)cmsMakeServerName;
stubVector[ZIS_STUB_CMGETPRX] = (void*)cmsGetConfigParmExt;
stubVector[ZIS_STUB_CMGETPUX] = (void*)cmsGetConfigParmExtUnchecked;
stubVector[ZIS_STUB_DYNASTXU] = (void*)createSimpleTextUnit;
stubVector[ZIS_STUB_DYNASTX2] = (void*)createSimpleTextUnit2;
stubVector[ZIS_STUB_DYNACTXU] = (void*)createCharTextUnit;
Expand Down
2 changes: 1 addition & 1 deletion deps/zowe-common-c
Open in desktop
Submodule zowe-common-c updated 10 files
+11 −0 CHANGELOG.md
+12 −2 c/alloc.c
+176 −17 c/crossmemory.c
+2 −2 c/httpserver.c
+142 −159 c/isgenq.c
+85 −31 c/qjszos.c
+2 −0 c/utils.c
+57 −1 h/crossmemory.h
+35 −37 h/isgenq.h
+172 −0 tests/isgenqtest.c
4 changes: 3 additions & 1 deletion h/zis/zisstubs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
FULL BACKWARD COMPATIBILITY MUST BE MAINTAINED
*/

#define ZIS_STUBS_VERSION 3
#define ZIS_STUBS_VERSION 4

/*
How does a user check for compatibility?
Expand Down Expand Up @@ -310,6 +310,8 @@
/* #define ZIS_STUB_CMECSAFR 382 cmsFreeECSAStorage - not in CMS_CLIENT */
/* #define ZIS_STUB_CMECSAA2 383 cmsAllocateECSAStorage2 - not in CMS_CLIENT */
/* #define ZIS_STUB_CMECSAF2 384 cmsFreeECSAStorage2 - not in CMS_CLIENT */
#define ZIS_STUB_CMGETPRX 385 /* cmsGetConfigParmExt */
#define ZIS_STUB_CMGETPUX 386 /* cmsGetConfigParmExtUnchecked */

/* dynalloc, 400-429 */
#define ZIS_STUB_DYNASTXU 400 /* createSimpleTextUnit mapped */
Expand Down
Loading