diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index e432a1b6d..ffbd15d86 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -34,7 +34,7 @@ EPICS_MODIFICATION = 6 EPICS_PATCH_LEVEL = 0 # This will end in -DEV between official releases -#EPICS_DEV_SNAPSHOT=-DEV +EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 @@ -43,7 +43,7 @@ EPICS_PATCH_LEVEL = 0 #EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV -EPICS_DEV_SNAPSHOT= +#EPICS_DEV_SNAPSHOT= # No changes should be needed below here diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html index 8729b7895..d477ca3bd 100644 --- a/documentation/RELEASE_NOTES.html +++ b/documentation/RELEASE_NOTES.html @@ -7,12 +7,23 @@ -

EPICS Base Release 3.15.6

+

EPICS Base Release 3.15.7

-

Changes made on the 3.15 branch since 3.15.5

+

This version of EPICS Base has not been released yet.

+ + +

Changes made on the 3.15 branch since 3.15.6

+

Changes from the 3.14 branch since 3.15.6

+ + + + + +

Changes made between 3.15.5 and 3.15.6

+

Unsetting environment variables

The new command epicsEnvUnset varname can be used to @@ -75,10 +86,7 @@ be put in a locally created base/configure/CONFIG_SITE.local file instead of having go modify or replace the original. A new .gitignore pattern tells git to ignore all configure/*.local files.

- -

Changes from the 3.14 branch since 3.15.5

- - +

Fix broken EPICS_IOC_LOG_FILE_LIMIT=0 setting