branch master updated (66253ff -> ee34b5c)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 66253ff [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' adds aa9ba14 Remove useless files adds 2bd5b1a #8755 Get dataQuality in right place adds 92002ca [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development adds b4f35b6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f8c9a76 [jgitflow-maven-plugin]merging 'master' into 'develop' adds d195ca5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8fd8e29 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop adds 3fd8d22 #8756 Setup spicies handling adds d3e565f #8752 Rename lengthCategoryMeaning to lengthClassMeaning adds cc3bf4a [jgitflow-maven-plugin]updating poms for branch'release/4.0.3' with non-snapshot versions adds ee34b5c [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 7 ++ .../VoyageResultsMapFishCellImportAction.java | 117 +++++++++++---------- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 2 +- .../csv/VoyageResultsMapFishCellImportRow.java | 7 +- .../csv/VoyageResultsRegionCellImportRow.java | 25 +++-- echobase-services/src/main/resources/actual | 99 ----------------- echobase-services/src/main/resources/expected | 99 ----------------- ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2605 -> 2601 bytes .../import-data/result/map/mapsFish.csv.gz | Bin 3387 -> 3377 bytes .../import-data/result/region/regionResults.csv.gz | Bin 13249 -> 13099 bytes .../import-data/result/region/regions.csv.gz | Bin 4440 -> 4413 bytes echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/importData.rst | 6 +- src/site/rst/importData.rst | 6 +- 17 files changed, 97 insertions(+), 279 deletions(-) delete mode 100644 echobase-services/src/main/resources/actual delete mode 100644 echobase-services/src/main/resources/expected -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm