Merge branch 'master' into release/5.0

jenkins: fix CloudBees doc job
2015-10-17 10:36:39 +01:00 · 2015-10-16 23:25:24 +01:00 · 2015-09-28 14:59:35 +02:00 · 2015-09-14 15:17:55 +02:00 · 2015-09-05 07:38:15 +01:00 · 2015-09-04 11:55:29 +02:00
1 changed files with 2 additions and 2 deletions
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -18,8 +18,8 @@ BASE=${1:-${DEFAULT_BASE}}
 USE_MB=${2:-"MB_NO"}

 # Dependent module branches (empty = master)
-PVCOMMON_BRANCH=""
-PVDATA_BRANCH=""
+PVCOMMON_BRANCH="Release-4.1-"
+PVDATA_BRANCH="Release-5.0-"

 ###########################################
 # Fetch and unpack dependencies
Author	SHA1	Message	Date
Dave Hickin	892f1e2242	Merge branch 'master' into release/5.0	2015-10-17 10:36:39 +01:00
Dave Hickin	f02ac3c139	Merge branch 'master' into release/5.0	2015-10-16 23:25:24 +01:00
Ralph Lange	fc641b48c3	jenkins: fix CloudBees doc job	2015-09-28 14:59:35 +02:00
Ralph Lange	bcaac0163a	jenkins: adapt doc script to new CloudBees jenkins job	2015-09-14 15:17:55 +02:00
Dave Hickin	f9d27b2d74	Merge branch 'master' into release/5.0	2015-09-05 07:38:15 +01:00
Ralph Lange	392cc7426d	jenkins: update dependencies pvCommonCPP/4.1 pvDataCPP/5.0	2015-09-04 11:55:29 +02:00