master #13

Merged

iparenteau merged 8 commits from master into release/1.1

2022-03-02 17:32:06 -06:00

Author	SHA1	Message	Date
Isaac Parenteau	a4c39918f0	Merge branch 'develop' into master All checks were successful Locusworks Team/app-logger/pipeline/head This commit looks good Details	2022-03-02 17:30:25 -06:00
Isaac Parenteau	55a2f620a1	Merge pull request 'Adjusted node' (#11 ) from bug/jenkins_update into develop All checks were successful Locusworks Team/app-logger/pipeline/head This commit looks good Details Reviewed-on: #11	2022-03-02 17:24:09 -06:00
Isaac Parenteau	b50eccc471	Adjusted node	2022-03-02 18:16:32 -05:00
Isaac Parenteau	ecfdf202d8	Merge pull request 'bug/jenkins_update' (#10 ) from bug/jenkins_update into develop Some checks reported errors Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit Details Reviewed-on: #10	2022-03-02 17:15:36 -06:00
Isaac Parenteau	43cffb3610	Merge branch 'develop' of ssh://gitea.locusworks.net:7999/locusworks/app-logger into bug/jenkins_update	2022-03-02 18:08:10 -05:00
Isaac Parenteau	8575afe735	Updated jenkins build file	2022-03-02 18:07:55 -05:00
Isaac Parenteau	1986831f2c	updated log4j library	2022-03-02 17:47:08 -05:00
Isaac Parenteau	9ac40b5922	Updated log4j	2022-03-02 17:41:44 -05:00