merge with iocLogClientFixes

2019-09-23 08:55:06 +02:00
parent 871af36ac5 5f0df840a3
commit d0adf702f1
15 changed files with 226 additions and 200 deletions
@@ -1,4 +1,12 @@
+# Version number for the database APIs and shared library
+
 EPICS_DATABASE_MAJOR_VERSION = 3
 EPICS_DATABASE_MINOR_VERSION = 17
-EPICS_DATABASE_MAINTENANCE_VERSION = 4
-EPICS_DATABASE_DEVELOPMENT_FLAG = 0
+EPICS_DATABASE_MAINTENANCE_VERSION = 5
+
+# Development flag, set to zero for release versions
+
+EPICS_DATABASE_DEVELOPMENT_FLAG = 1
+
+# Immediately after a release the MAINTENANCE_VERSION
+# will be incremented and the DEVELOPMENT_FLAG set to 1
@@ -33,3 +33,6 @@ variable(callbackParallelThreadsDefault,int)

 # Real-time operation
 variable(dbThreadRealtimeLock,int)
+
+# show logClient network activity
+variable(logClientDebug,int)