This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from d2c85b4 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop new a5b99ae ajout de migration des ids défaillants (refs #7142) new 49f7fc8 fixes #7142: Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine Merge branch 'feature/7142' into develop new ab4e457 permettre d'utiliser des valeurs de variables non String (refs #7137) new 8890409 ajout du rapport (refs #7137) new 647b966 fixes #7137: [PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées Merge branch 'feature/7137' into develop The 5 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 647b96672e65e4c5dae81a71e17b23378804088f Merge: 49f7fc8 8890409 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 20:23:30 2015 +0200 fixes #7137: [PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées Merge branch 'feature/7137' into develop commit 8890409a7d230f9fdfef8ed6a13f280cdf501137 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 20:23:25 2015 +0200 ajout du rapport (refs #7137) commit ab4e4575476e3606b81306bf6ddae5afe4bd1394 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 20:23:05 2015 +0200 permettre d'utiliser des valeurs de variables non String (refs #7137) commit 49f7fc8f28ed2d96e18de6b8e5057a550e50faa4 Merge: d2c85b4 a5b99ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 20:21:35 2015 +0200 fixes #7142: Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine Merge branch 'feature/7142' into develop commit a5b99ae55bf3195cc4f632285b5212602f774537 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 20:21:24 2015 +0200 ajout de migration des ids défaillants (refs #7142) Summary of changes: .../src/main/filters/observe-reports.properties | 41 ++++++++++++++++++++++ .../fr/ird/observe/report/model/ReportExecute.java | 12 +++---- .../ird/observe/report/model/ReportOperation.java | 2 +- .../fr/ird/observe/report/model/ReportRequest.java | 10 +++--- .../report/model/operations/ExecuteRequests.java | 2 +- .../migration/AbstractDataSourceMigration.java | 4 ++- ... => DataSourceMigrationForVersion_4_0_RC6.java} | 40 +++++---------------- .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 5 +++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 5 +++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 3 +- 12 files changed, 79 insertions(+), 49 deletions(-) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0_RC6.java} (51%) create mode 100644 observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql create mode 100644 observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.