Commits · master · Aynom / shyft · GitLab

Sep 11, 2019
- Merge branch 'drms_2' into 'master' · 6501ac0f
  Sigbjørn Helset authored Sep 11, 2019
  6501ac0f
- Drms 2 · de10f780
  Cecilie Granerød authored Sep 11, 2019 and Sigbjørn Helset committed Sep 11, 2019
  
  de10f780
- Merge branch '500-cmake-boost-1-71-minor-improvement' into 'master' · e761219d
  anybo authored Sep 11, 2019
  e761219d
- Add boost 1.71 to list of versions, in addition to 1.71.0 · 34e18d61
  anybo authored Sep 11, 2019
  
  34e18d61
Sep 06, 2019
- Merge branch 'jenkins_build_36_37_3' into 'master' · 48dbd624
  Eivind Lyche Melvær authored Sep 06, 2019
  48dbd624
- Jenkins: Make sure we upload the same package as we built · b9f11de1
  Eivind Lyche Melvær authored Sep 06, 2019
  
  b9f11de1
- Merge branch 'jenkins_build_36_37_2' into 'master' · 8868734b
  Eivind Lyche Melvær authored Sep 06, 2019
  8868734b
- Specify python version to conda build · 25716f46
  Eivind Lyche Melvær authored Sep 06, 2019
  
  25716f46
- Merge branch 'drms_2' into 'master' · 18a264f4
  Sigbjørn Helset authored Sep 06, 2019
  18a264f4
- resynced with master · 362e5e09
  Sigbjørn Helset authored Sep 06, 2019
  
  362e5e09
- added set_state_collection and set_snow_sca_swe_collection · cc3f4466
  cecilie authored Sep 06, 2019
  
  cc3f4466
- add clone region model · a9659519
  cecilie authored Sep 06, 2019
  
  a9659519
- Merge branch 'cmake_boost_py_refactor' into 'master' · 495cc426
  Sigbjørn Helset authored Sep 06, 2019
  495cc426
- Cmake boost py refactor · 41aef892
  Sigbjørn Helset authored Sep 06, 2019
  
  41aef892
Sep 05, 2019
- Merge branch 'jenkins_build_36_37' into 'master' · 4247ed6a
  Eivind Lyche Melvær authored Sep 05, 2019
  4247ed6a
- Remove conda env activation from jenkins.sh in order to enable building for... · 92b935fd
  Eivind Lyche Melvær authored Sep 05, 2019
  92b935fd
Sep 04, 2019
- Merge branch 'drms_2' into 'master' · 5c02b389
  Sigbjørn Helset authored Sep 04, 2019
  5c02b389
- Revert "py-expose rename_model" · 438b5918
  Cecilie Granerød authored Sep 04, 2019 and Sigbjørn Helset committed Sep 04, 2019
  438b5918
- resolve merge conflict · fd73be75
  cecilie authored Sep 04, 2019
  
  fd73be75
- Revert "py-expose rename_model" · 9080a20d
  cecilie authored Sep 04, 2019
  9080a20d
- py-expose rename_model · a17e68d5
  cecilie authored Sep 04, 2019
  
  a17e68d5
- add revert_to_initial_state · 160be68f
  cecilie authored Sep 04, 2019
  
  160be68f
- adjust_q_result serialization and equality, and returned by adjust_q · 7cbe29e3
  cecilie authored Sep 04, 2019
  
  7cbe29e3
- setting region environment in python test · d160c322
  cecilie authored Sep 04, 2019
  
  d160c322
Sep 03, 2019
- Merge branch 'fix_missing_gcov_lib' into 'master' · fcf07fb1
  Sigbjørn Helset authored Sep 03, 2019
  fcf07fb1
- Add gcov to shyft-core when doing coverage · 9706dc6d
  Sigbjørn Helset authored Sep 03, 2019
  
  9706dc6d
- Merge branch 'em_build_fix_rpath' into 'master' · a93b6904
  Sigbjørn Helset authored Sep 03, 2019
  a93b6904
- Fixed rpath for building em components · 996366c8
  Eivind Lyche Melvær authored Sep 03, 2019 and Sigbjørn Helset committed Sep 03, 2019
  
  996366c8
Sep 02, 2019
- Merge branch 'py37_build' into 'master' · b15a52eb
  Sigbjørn Helset authored Sep 02, 2019
  b15a52eb
- Support for multiple python version builds · 2ac25ed8
  Sigbjørn Helset authored Sep 02, 2019
  
  2ac25ed8
Aug 30, 2019
- Merge branch 'rename_model' into 'master' · 4e2c38c7
  Sigbjørn Helset authored Aug 30, 2019
  4e2c38c7
- drms: rename_model · d7dcb4af
  Cecilie Granerød authored Aug 30, 2019 and Sigbjørn Helset committed Aug 30, 2019
  
  d7dcb4af
- implement rename_model · 96ad2a66
  cecilie authored Aug 30, 2019
  
  96ad2a66
Aug 28, 2019
- Merge branch 'drms_remove_model' into 'master' · b574be71
  Sigbjørn Helset authored Aug 28, 2019
  b574be71
- drms:adding .remove_model(mid) and .get_model_ids() to ease sustainable use of server · 6cfbe1e4
  Sigbjørn Helset authored Aug 28, 2019
  
  6cfbe1e4
- Merge branch 'drms_1' into 'master' · c35e5114
  Sigbjørn Helset authored Aug 28, 2019
  c35e5114
- Started implemeting serialization of pt_gs_k. Added test. Implemented... · 66108732
  Sigbjørn Helset authored Aug 28, 2019
  66108732
Aug 16, 2019
- Merge branch 'em_migration' into 'master' · cc5e3e0b
  Sigbjørn Helset authored Aug 16, 2019
  cc5e3e0b
- Em migration · d10c0afc
  Diako Darian authored Aug 16, 2019 and Sigbjørn Helset committed Aug 16, 2019
  
  d10c0afc
- Merge branch 'fix_ts_eq_exception' into 'master' · 757f62ef
  Sigbjørn Helset authored Aug 16, 2019
  757f62ef