Commit d48dbd751939106f7612bf5b8730d33c5fe738df
Exists in
master
and in
98 other branches
Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_Kernel
Showing
5 changed files
with
6 additions
and
5 deletions
Show diff stats
CMakeLists.txt
| ... | ... | @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) |
| 3 | 3 | PROJECT(AMDA-Kernel) |
| 4 | 4 | |
| 5 | 5 | SET(CPACK_PACKAGE_VERSION_MAJOR "3") |
| 6 | -SET(CPACK_PACKAGE_VERSION_MINOR "5") | |
| 6 | +SET(CPACK_PACKAGE_VERSION_MINOR "6") | |
| 7 | 7 | SET(CPACK_PACKAGE_VERSION_PATCH "0") |
| 8 | 8 | |
| 9 | 9 | # configure a header file to pass some of the CMake settings to the source code | ... | ... |
config/xsd/info/paramInfo.xsd
| ... | ... | @@ -97,6 +97,7 @@ |
| 97 | 97 | </xs:complexType> |
| 98 | 98 | </xs:element> |
| 99 | 99 | <xs:element name="dataset_id" type="xs:string"></xs:element> |
| 100 | + <xs:element name="instrument_id" type="xs:string"></xs:element> | |
| 100 | 101 | </xs:sequence> |
| 101 | 102 | </xs:complexType> |
| 102 | 103 | </xs:schema> |
| 103 | 104 | \ No newline at end of file | ... | ... |
config/xsd/parameter/parameter.xsd
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | <xs:complexType> |
| 19 | 19 | <xs:sequence> |
| 20 | 20 | <xs:element name="info" type="infoType" minOccurs="0" maxOccurs="1"></xs:element> |
| 21 | - <xs:element name="time_resolution" type="xs:integer" | |
| 21 | + <xs:element name="time_resolution" type="xs:float" | |
| 22 | 22 | minOccurs="0" maxOccurs="1" /> |
| 23 | 23 | <xs:element name="gap_threshold" type="xs:integer" |
| 24 | 24 | minOccurs="0" maxOccurs="1" /> | ... | ... |
sonar-project.properties
| ... | ... | @@ -15,8 +15,8 @@ sonar.sourceEncoding=UTF-8 |
| 15 | 15 | # required metadata |
| 16 | 16 | sonar.projectKey=AKKA:AMDA-Kernel |
| 17 | 17 | sonar.projectName=AMDA-Kernel |
| 18 | -sonar.projectVersion=3.5.0 | |
| 19 | -sonar.branch=3.5 | |
| 18 | +sonar.projectVersion=3.6.0 | |
| 19 | +sonar.branch=3.6 | |
| 20 | 20 | |
| 21 | 21 | # path to source directories (required) |
| 22 | 22 | #sources=/var/lib/jenkins/.jenkins/workspace/AMDA_FitnesseTest/AMDA_Kernel | ... | ... |