This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b5e9529de27af9097d41877d6cf4056fe1b4c4a3 Merge: 5ef97c9 8ccd467 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:26 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' echobase-domain/pom.xml | 2 +- .../src/main/data/export-AgeCategory.csv | 5 + echobase-domain/src/main/data/export-Category.csv | 8 + echobase-domain/src/main/data/export-CellType.csv | 8 + .../src/main/data/export-DataMetadata.csv | 169 ++++++++++++++ echobase-domain/src/main/data/export-DataType.csv | 29 +++ .../src/main/data/export-DepthStratum.csv | 21 ++ echobase-domain/src/main/data/export-Gear.csv | 188 +++++++++++++++ .../src/main/data/export-GearMetadata.csv | 8 + .../src/main/data/export-SampleDataType.csv | 137 +++++++++++ .../src/main/data/export-SampleType.csv | 6 + .../src/main/data/export-SizeCategory.csv | 8 + echobase-domain/src/main/data/export-Species.csv | 256 +++++++++++++++++++++ echobase-domain/src/main/data/export-Strata.csv | 2 + .../src/main/data/export-TSParameters.csv | 134 +++++++++++ echobase-domain/src/main/data/export-Vessel.csv | 14 ++ .../src/main/data/export-VesselType.csv | 8 + .../echobase/entities/data/CellTopiaDao.java | 54 +++++ .../WorkingDbMigrationCallBackForVersion3_906.java | 54 +++++ .../migration/workingDb/3.906-0-add-indexes.sql | 21 ++ echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 2 +- .../actions/VoyageAcousticsImportAction.java | 2 +- .../gis/templates/EchoBaseQGisTemplate.qgs | 2 +- .../src/test/resources/log4j.properties | 1 + echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/configure.rst.vm | 28 +-- src/site/en/rst/model.rst | 4 + src/site/en/rst/update.rst.vm | 2 +- src/site/resources/model/Transverse.png | Bin 5934 -> 9110 bytes src/site/resources/model/dataAcoustic.png | Bin 30243 -> 34954 bytes src/site/resources/model/dataCatches.png | Bin 22259 -> 22223 bytes src/site/resources/model/dataCategory.png | Bin 9107 -> 9122 bytes src/site/resources/model/dataCommon.png | Bin 29256 -> 34469 bytes src/site/resources/model/dataEchotype.png | Bin 6836 -> 6860 bytes src/site/resources/model/dataLengthAgeKey.png | Bin 6800 -> 6754 bytes src/site/resources/model/dataLengthWeightKey.png | Bin 6658 -> 5566 bytes src/site/resources/model/dataMooring.png | Bin 0 -> 14136 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/resources/model/referenceAll.png | Bin 65068 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes src/site/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes src/site/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes src/site/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/resources/model/referenceGear.png | Bin 12657 -> 12676 bytes src/site/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/resources/model/referenceOperation.png | Bin 5848 -> 5858 bytes src/site/resources/model/referencePort.png | Bin 0 -> 3465 bytes src/site/resources/model/referenceProtocole.png | Bin 6561 -> 6576 bytes .../resources/model/referenceReferenceDatum.png | Bin 3124 -> 3134 bytes src/site/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/resources/model/referenceSpecies.png | Bin 14271 -> 14498 bytes src/site/resources/model/referenceStrata.png | Bin 7889 -> 7903 bytes src/site/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/rst/model.rst | 4 + 58 files changed, 1161 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.