Merge branch 'master' into 2.4.0-a31-u14-w3-p3-20190304

docker · Mar 7, 2019 · dbfb509 · dbfb509
2 parents 80ab130 + 27f3d1c
commit dbfb509
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,7 +21,6 @@ pipeline {
                         echo "You must define an imagename in common.bash"
                         currentBuild.result = 'FAILURE'
                      }
-
                     sh 'mkdir -p tmp && mkdir -p bin'
                     dir('tmp'){
                       git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
@@ -18,6 +18,7 @@ grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
 grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_31,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
 
+
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true
 ########## AUTORUN PROPERTIES WITH NO DEFAULT OR ARE COMMONLY CHANGED