Skip to content

Commit

Permalink
5.4 checkin
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] authored and [email protected] committed Nov 10, 2023
1 parent caf5311 commit af2ea86
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build-all.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Top-level build script for everything. This build NCSA, QDL, OA4MP then CILogon.

CILOGON_OA2_DEPLOY=$NCSA_DEV_OUTPUT/cilogon-oa2
CILOGON_OA2_DEPLOY=$NCSA_DEV_OUTPUT/cilogon

echo "cleaning out old deploy in " $NCSA_DEV_OUTPUT
if [ -d "$CILOGON_OA2_DEPLOY" ]
Expand Down
4 changes: 2 additions & 2 deletions qdl/buildNumber.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Tue Oct 31 09:35:01 CDT 2023
buildNumber\\d*=1263
#Thu Nov 09 17:26:25 CST 2023
buildNumber\\d*=1281
4 changes: 2 additions & 2 deletions server/buildNumber.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#maven.buildNumber.plugin properties file
#Tue Oct 31 09:35:01 CDT 2023
buildNumber\\d*=2746
#Thu Nov 09 17:25:59 CST 2023
buildNumber\\d*=2756
=\=\=\=\=\=\=
>>>>>>>=Stashed changes
<<<<<<<=Updated upstream
4 changes: 2 additions & 2 deletions test/buildNumber.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#maven.buildNumber.plugin properties file
#Tue Oct 31 09:35:01 CDT 2023
buildNumber\\d*=2639
#Thu Nov 09 17:26:05 CST 2023
buildNumber\\d*=2649
=\=\=\=\=\=\=
>>>>>>>=Stashed changes
<<<<<<<=Updated upstream

0 comments on commit af2ea86

Please sign in to comment.