55536a13db
revert several files back to upstream version
2021-07-19 15:36:29 +02:00
f25f067e9c
Merge branch '7.0' into PSI-7.0
...
Conflicts:
modules/database/test/std/link/Makefile
modules/libcom/src/osi/os/posix/osdMutex.c
modules/libcom/src/osi/os/vxWorks/osdThread.h
2021-03-24 14:45:02 +01:00
Andrew Johnson
bbb4d86f78
Enable RTEMS testing in modules/database/test/std/link
2021-03-03 18:17:31 -06:00
1a0de528e1
Merge tag 'R7.0.5' into PSI-7.0
...
ANJ: Tagged for release
Conflicts:
configure/os/CONFIG_SITE.Common.linuxCommon
2021-03-02 09:18:43 +01:00
Andrew Johnson
7cc246afc1
Modify database tests to use JSON5
...
(except for the tests that check parsing).
Remove escaped double-quotes in map keys where possible.
Replace escaped double-quotes with single quotes.
2020-08-09 00:33:07 -05:00
Andrew Johnson
3c99391d93
Added SPDX License ID to all EPICS-original source files
...
In some cases the license-identification header was missing,
so I added that as well. Replaced the remaining headers that
specifically identified "Versions 3.13.7 and higher".
Makefiles and the build system were deliberately excluded.
2020-08-03 11:53:01 -05:00
86adc529ef
Merge remote-tracking branch 'origin' into PSI-7.0
...
Conflicts:
configure/os/CONFIG_SITE.Common.linuxCommon
modules/libcom/src/log/iocLog.c
modules/libcom/src/log/logClient.c
modules/pvAccess
modules/pvData
modules/pvDatabase
2020-02-06 17:28:40 +01:00
09a17127a9
make xxxTestHarness TESTPRODs instead of PRODs
2019-09-02 10:47:43 +02:00
Michael Davidsaver
834e202671
missed a TOP
2019-01-03 20:44:50 -08:00
Michael Davidsaver
49b323b93c
avoided embedded TOP for non sub-modules
2019-01-03 20:17:58 -08:00
Andrew Johnson
2efe56c6d1
Merge 3.16 (after 3.16.2-rc1) into 7.0
2018-10-26 17:04:53 -05:00
