From 1ba4eb4cf9f5f6b14954aa1b87ca58a607c505f3 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <matej.sekoranja@cosylab.com>
Date: Wed, 2 Sep 2015 09:05:17 +0200
Subject: [PATCH 01/11] version updated

---
 src/pva/pvaVersion.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pva/pvaVersion.h b/src/pva/pvaVersion.h
index 076668d..6698b37 100644
--- a/src/pva/pvaVersion.h
+++ b/src/pva/pvaVersion.h
@@ -27,7 +27,7 @@
 #define EPICS_PVA_MAJOR_VERSION 4
 #define EPICS_PVA_MINOR_VERSION 1
 #define EPICS_PVA_MAINTENANCE_VERSION 0
-#define EPICS_PVA_DEVELOPMENT_FLAG 1
+#define EPICS_PVA_DEVELOPMENT_FLAG 0
 
 namespace epics {
 namespace pvAccess {

From 98efc2fdfa974adde00b0dd4d1dee2579f5228e9 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Wed, 2 Sep 2015 09:30:52 +0200
Subject: [PATCH 02/11] jenkins: depend on release/4.1 build of pvCommonCPP

---
 jenkins/cloudbees_build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index c75bc60..f7f5723 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -32,7 +32,7 @@ tar -xzf base-${BASE}.CB-dist.tar.gz
 tar -xzf pvData.CB-dist.tar.gz
 
 if [ "${USE_MB}" = "MB_YES" ]; then
-    wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz
+    wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_Release-4.1-Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz
     tar -xzf pvCommon.CB-dist.tar.gz
 fi
 

From b3f0b5039f818835f2fd14a7fe4b1e29e713ad7c Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <matej.sekoranja@cosylab.com>
Date: Wed, 2 Sep 2015 10:23:39 +0200
Subject: [PATCH 03/11] minor correction

---
 TODO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 5c5ba4a..7c82d7e 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,6 @@
 
 - improve searching of channel with server address specified
 
-- void transportUnresponsive() { not implemented (also in Java)
+- void transportUnresponsive() is not implemented (also in Java)
 - complete authNZ (callback on right change)
 - request event on disconnect/destroy, etc.?

From c0fada216eee17785a28b44baa7b5bca7a79d793 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Thu, 3 Sep 2015 11:49:49 +0200
Subject: [PATCH 04/11] jenkins: easier configuration of dependent module
 branches

---
 jenkins/cloudbees_build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index f7f5723..16b31c5 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -17,6 +17,10 @@ DEFAULT_BASE=3.14.12.5
 BASE=${1:-${DEFAULT_BASE}}
 USE_MB=${2:-"MB_NO"}
 
+# Dependent module branches (empty = master)
+PVCOMMON_BRANCH="Release-4.1-"
+PVDATA_BRANCH=""
+
 ###########################################
 # Fetch and unpack dependencies
 
@@ -27,12 +31,12 @@ mkdir -p ${STUFF}
 cd ${STUFF}
 
 wget -nv https://openepics.ci.cloudbees.com/job/Base-${BASE}_Build/lastSuccessfulBuild/artifact/base-${BASE}.CB-dist.tar.gz
-wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz
+wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_${PVDATA_BRANCH}Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz
 tar -xzf base-${BASE}.CB-dist.tar.gz
 tar -xzf pvData.CB-dist.tar.gz
 
 if [ "${USE_MB}" = "MB_YES" ]; then
-    wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_Release-4.1-Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz
+    wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_${PVCOMMON_BRANCH}Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz
     tar -xzf pvCommon.CB-dist.tar.gz
 fi
 

From 8470c6dcc2043cca95379b04bf0704ce15920114 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Fri, 4 Sep 2015 16:26:07 +0200
Subject: [PATCH 05/11] jenkins: update dependency version pvDataCPP/5.0

---
 jenkins/cloudbees_build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index 16b31c5..514d61d 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -19,7 +19,7 @@ USE_MB=${2:-"MB_NO"}
 
 # Dependent module branches (empty = master)
 PVCOMMON_BRANCH="Release-4.1-"
-PVDATA_BRANCH=""
+PVDATA_BRANCH="Release-5.0-"
 
 ###########################################
 # Fetch and unpack dependencies

From d383161aabe70b04f389b9dae284a73acbf064d7 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Mon, 14 Sep 2015 16:33:25 +0200
Subject: [PATCH 06/11] jenkins: adapt doc script to new CloudBees jenkins job

---
 jenkins/cloudbees_doc | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc
index 4307660..080f811 100644
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -10,11 +10,10 @@
 # All rights reserved. Use is subject to license terms.
 
 ###########################################
-# Determine EPICS Base version
+# Set EPICS Base version and upload target
 
-DEFAULT_BASE=3.14.12.5
-
-BASE=${1:-${DEFAULT_BASE}}
+BASE=3.15.2
+PUBLISH=${1:-DONT}
 
 ###########################################
 # Fetch and unpack dependencies
@@ -43,4 +42,13 @@ doxygen
 ###########################################
 # Publish
 
-rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/tip
+if [ "${PUBLISH}" != "DONT" ]; then
+    # Upload explicit dummy to ensure target directory exists
+    echo "Created by CloudBees Jenkins upload job. Should be deleted as part of the job." > DUMMY
+    rsync -q -e ssh DUMMY epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/${PUBLISH}/DUMMY
+
+    rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/${PUBLISH}/
+fi
+###########################################
+# Publish
+

From b2ab41cbb871bf1a49b68946457c31c37a196d10 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Mon, 28 Sep 2015 14:30:15 +0200
Subject: [PATCH 07/11] Fix: remove inclusion of cadef.h in caStatus.h
 (unneeded)

---
 src/ca/caStatus.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ca/caStatus.h b/src/ca/caStatus.h
index 5f16e2a..6767094 100644
--- a/src/ca/caStatus.h
+++ b/src/ca/caStatus.h
@@ -9,8 +9,6 @@
 
 #include <string>
 
-#include <cadef.h>
-
 #include <shareLib.h>
 
 namespace epics {

From e64c08fd5468761646ee4b29a60c02c2685ea8ea Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Mon, 28 Sep 2015 14:57:22 +0200
Subject: [PATCH 08/11] jenkins: fix CloudBees doc job

---
 jenkins/cloudbees_doc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc
index 080f811..730602e 100644
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -45,10 +45,7 @@ doxygen
 if [ "${PUBLISH}" != "DONT" ]; then
     # Upload explicit dummy to ensure target directory exists
     echo "Created by CloudBees Jenkins upload job. Should be deleted as part of the job." > DUMMY
-    rsync -q -e ssh DUMMY epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/${PUBLISH}/DUMMY
+    rsync -q -e ssh DUMMY epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/${PUBLISH}/
 
     rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/${PUBLISH}/
 fi
-###########################################
-# Publish
-

From b80c0aa1c95abc2e76aa61313e502fb019a1cfcd Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <matej.sekoranja@cosylab.com>
Date: Thu, 8 Oct 2015 09:02:22 +0200
Subject: [PATCH 09/11] 4.1.2 release

---
 documentation/RELEASE_NOTES.md | 33 ++++++++++++++++-----------------
 src/pva/pvaVersion.h           |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md
index 9d55014..d1252c7 100644
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -1,18 +1,17 @@
-Release release/3.1 IN DEVELOPMENT
-===========
-
-The main changes since release 3.0.2 are:
-
-* pvAccess API is changed.
-
-
-pvAccess API is changed.
-------------
-
-Instead of data (PVStructure) appearing in connect callback (for example channelGetConnect)
-it now is present in method called by whoever delivers the data.
-See pvAccessJava.html for details.
-
-Release 3.0.4
+Release 4.1.2 
 ==========
-This was the starting point for RELEASE_NOTES
+
+* Improved Jenkins build support
+* Removed QtCreated IDE configuration files
+* Use of getSubField<> instead of e.g. getDoubleField()
+* CA support for pvget, pvput and pvinfo.
+* vxWorks/RTEMS compiler warnings resolved.
+* Transport shutdown improved.
+* CA DBR status fix.
+* Monitor queue handling improved.
+* Fixed bad performance on 10Gbit or faster networks.
+* Async RPC service.
+
+Release 4.0.5 
+==========
+(Starting point for release notes.)
diff --git a/src/pva/pvaVersion.h b/src/pva/pvaVersion.h
index 6698b37..4b63c18 100644
--- a/src/pva/pvaVersion.h
+++ b/src/pva/pvaVersion.h
@@ -26,7 +26,7 @@
 // TODO to be generated, etc.
 #define EPICS_PVA_MAJOR_VERSION 4
 #define EPICS_PVA_MINOR_VERSION 1
-#define EPICS_PVA_MAINTENANCE_VERSION 0
+#define EPICS_PVA_MAINTENANCE_VERSION 2
 #define EPICS_PVA_DEVELOPMENT_FLAG 0
 
 namespace epics {

From 3105819a54bbebd3277463c82fd44cd0ae8648b5 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <matej.sekoranja@cosylab.com>
Date: Mon, 12 Oct 2015 23:28:21 +0200
Subject: [PATCH 10/11] RELEASE_NOTES, README cleanup

---
 documentation/RELEASE_NOTES.md => RELEASE_NOTES.md |  0
 documentation/{README => DEPLOY_INSTRUCTIONS}      |  0
 documentation/RELEASE_NOTES.html                   | 11 -----------
 documentation/TODO.html                            |  9 ---------
 documentation/TODO.md                              | 13 -------------
 5 files changed, 33 deletions(-)
 rename documentation/RELEASE_NOTES.md => RELEASE_NOTES.md (100%)
 rename documentation/{README => DEPLOY_INSTRUCTIONS} (100%)
 delete mode 100644 documentation/RELEASE_NOTES.html
 delete mode 100644 documentation/TODO.html
 delete mode 100644 documentation/TODO.md

diff --git a/documentation/RELEASE_NOTES.md b/RELEASE_NOTES.md
similarity index 100%
rename from documentation/RELEASE_NOTES.md
rename to RELEASE_NOTES.md
diff --git a/documentation/README b/documentation/DEPLOY_INSTRUCTIONS
similarity index 100%
rename from documentation/README
rename to documentation/DEPLOY_INSTRUCTIONS
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
deleted file mode 100644
index ea1e263..0000000
--- a/documentation/RELEASE_NOTES.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<h1>Release release/3.1 IN DEVELOPMENT</h1>
-<p>The main changes since release 3.0.2 are:</p>
-<ul>
-<li>pvAccess API is changed.</li>
-</ul>
-<h2>pvAccess API is changed.</h2>
-<p>Instead of data (PVStructure) appearing in connect callback (for example channelGetConnect)
-it now is present in method called by whoever delivers the data.
-See pvAccessJava.html for details.</p>
-<h1>Release 3.0.4</h1>
-<p>This was the starting point for RELEASE_NOTES</p>
\ No newline at end of file
diff --git a/documentation/TODO.html b/documentation/TODO.html
deleted file mode 100644
index 1f92d0b..0000000
--- a/documentation/TODO.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>TODO</h1>
-<h2>pvAccessCPP.html</h2>
-<p>This needs to be written.
-For now it just refers to pvAccessJava.html</p>
-<h2>RPCClient</h2>
-<p>The C++ implementation only has method request.
-The Java version has methods: destroy, waitConnect, request, sendRequest, and waitResponse.</p>
-<h2>Matej to add info</h2>
-<p>This markdown document is for Matej to edit.</p>
\ No newline at end of file
diff --git a/documentation/TODO.md b/documentation/TODO.md
deleted file mode 100644
index 4e6ca1f..0000000
--- a/documentation/TODO.md
+++ /dev/null
@@ -1,13 +0,0 @@
-TODO
-===========
-
-pvAccessCPP.html
-------------
-
-This needs to be written.
-For now it just refers to pvAccessJava.html
-
-Matej to add info
---------
-
-This markdown document is for Matej to edit.

From 7dc7615de2c49182e37f0f7728485145c7a42960 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <matej.sekoranja@cosylab.com>
Date: Wed, 14 Oct 2015 08:56:51 +0200
Subject: [PATCH 11/11] links updated in README

---
 README | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 407beb9..b35a975 100644
--- a/README
+++ b/README
@@ -100,8 +100,8 @@ testValue                     0
 REFERENCES
 ==========
 [1] http://epics-pvdata.sourceforge.net
-[2] http://sourceforge.net/p/epics-pvdata/pvAccessCPP/ci/default/tree/
-[3] http://sourceforge.net/p/epics-pvdata/pvAccessJava/ci/default/tree/
-[4] http://sourceforge.net/p/epics-pvdata/pvDataCPP/ci/default/tree/
-[5] http://sourceforge.net/p/epics-pvdata/pvCommonCPP/ci/default/tree/
+[2] https://github.com/epics-base/pvAccessCPP
+[3] https://github.com/epics-base/pvAccessJava
+[4] https://github.com/epics-base/pvDataCPP
+[5] https://github.com/epics-base/pvCommonCPP