This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git from e7a4526 Plantage des calculs taille/poids lorsque des paramètres de conversion existent pour plusieurs sexes (termine #7628) Merge branch 'feature/7628' into develop-4.x new 2f2a795 Ajout d'un log pour voir le nombre de données trouvées pour chaque variable d'un rapport (See #7671) new d9d7218 Ajout de la migration pour supprimer le champs datearriveeport (See #7671) new 5d0f879 Champ résiduel issu de la traduction FR->EN (termine #7671) Merge branch 'feature/7671' into develop-4.x The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5d0f879fdeac4873be6435f00b5729651bc0cb04 Merge: e7a4526 d9d7218 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 17:25:23 2015 +0100 Champ résiduel issu de la traduction FR->EN (termine #7671) Merge branch 'feature/7671' into develop-4.x commit d9d72181b62bd7dcdf5b5e7abc60cd23c083f779 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 17:25:20 2015 +0100 Ajout de la migration pour supprimer le champs datearriveeport (See #7671) commit 2f2a79551893caa7a962d3fb8703e42f5f50ea90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 15:39:15 2015 +0100 Ajout d'un log pour voir le nombre de données trouvées pour chaque variable d'un rapport (See #7671) Summary of changes: .../fr/ird/observe/report/model/ReportExecute.java | 3 ++ .../src/test/resources/db/4.0.4/referentiel.sql.gz | Bin 0 -> 138244 bytes .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_4.java | 48 +++++++++++++++++++++ .../remove-trip-datearriveeport-field-H2.sql} | 4 +- .../remove-trip-datearriveeport-field-PG.sql} | 4 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85857 bytes 10 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0.4/referentiel.sql.gz create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java copy observe-entities/src/main/resources/db/{4.0/empty-H2.sql => 4.0.4/remove-trip-datearriveeport-field-H2.sql} (92%) copy observe-entities/src/main/resources/db/{4.0/empty-H2.sql => 4.0.4/remove-trip-datearriveeport-field-PG.sql} (92%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.