lp:~anj/epics-base/ntptime-on-vxworks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~epics-core/epics-base/3.15 at revision 12704

Ralph Lange: Approve on 2015-10-11

Diff: 296 lines (+112/-37)

4 files modified

documentation/RELEASE_NOTES.html (+12/-0)
src/libCom/osi/Makefile (+4/-0)
src/libCom/osi/os/vxWorks/osdTime.cpp (+37/-5)
src/libCom/osi/osiClockTime.c (+59/-32)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12703. By Andrew Johnson on 2015-10-05

Make the NTPTime provider optional on VxWorks

12702. By Andrew Johnson on 2015-09-18

Merged changes from 3.14 branch, to revno 12604

12701. By Andrew Johnson on 2015-08-20

Merge changes from 3.14 branch, to revno 12599

12700. By Andrew Johnson on 2015-08-13

libCom/errlog: Don't store stderr in pvtData.console

Some VxWorks BSPs close the stderr stream that the shell running
the startup script created and open a new one for the interactive
shell. This change makes pvtData.console==NULL mean use stderr
instead of storing the stderr value in pvtData.console at init.

12699. By Andrew Johnson on 2015-07-24

Let dbdToHtml work with wrong newlines

12698. By Andrew Johnson on 2015-07-23

Merged dbCa bug-fix from 3.14 branch, revno 12595

12697. By Andrew Johnson on 2015-07-23

Fix smoothing for Nan/Inf values in devAiSoftCallback

12696. By Andrew Johnson on 2015-07-23

Removed extraneous .db file

12695. By Andrew Johnson on 2015-07-23

Merged changes from 3.14 branch to revno 12594

12694. By mdavidsaver on 2015-07-21

iocInit: move dbCaShutdown earlier

Switch dbCaShutdown from an exit hook to
be called from iocShutdown. Place it
after callback shutdown.