Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
dSS - digitalSTROM Server
dss-mainline
Commits
15f5ab15
Commit
15f5ab15
authored
3 years ago
by
andreas.fenkart
Browse files
Options
Download
Plain Diff
Merge branch 'MR_migration_of_files_at_startup' into 'master'
Mr migration of files at startup See merge request
!2597
parents
2bd8855c
1b6bcbda
master
DSD-10252-heatbeat-increase-for-dutch-p1-support
DSD-10490-crash
DSD-11013-wrong-dutch-translation
DSD-7417
JEAN_P1_MASTER
MR_device_setBinaryType
MR_drop_boost_filesystem
MR_getModelFeatures2
MR_install_libds_as_shared_library
MR_metering_storage
MR_metering_webscocket
MR_open_metering_system_archive
MR_p1_metering
MR_prepare_public_api_sync
MR_sync_open_metering_system
R2111
R2204
R2207
R2210
R2303
R2309
R2311
R2411
bugfix/DSD-10490-fix-crash
bugfix/DSD-3172-support-umr200-config_3_7_0
cherry-pick-921e00cb
cherry-pick-921e00cb-2
feature/DSD-10170-support-area-names
jeanvisagie/dss-mainline-p1_crc
mock_api_endpoints
testing
testing_safe
update_ubuntu
weather_api
1.19.11
1.19.11-beta01
1.19.10.1
1.19.10.1-beta01
1.19.10
1.19.9
1.19.9-beta03
1.19.9-beta02
1.19.9-beta01
1.19.8.1
1.19.8
1.19.8-beta03
1.19.8-beta02
1.19.8-beta01
1.19.7.1
1.19.7
1.19.7-beta07
1.19.7-beta06
1.19.7-beta05
1.19.7-beta04
1.19.7-beta03
1.19.7-beta02
1.19.7-beta01
1.19.6.3
1.19.6.2
1.19.6.1
1.19.6.1-beta01
1.19.6
1.19.6-beta03
1.19.6-beta02
1.19.6-beta01
1.19.5.1
1.19.5.1-beta02
1.19.5.1-beta01
1.19.5
1.19.5-beta03
1.19.5-beta02
1.19.5-beta01
1.19.4
1.19.4-beta04
1.19.4-beta03
1.19.4-beta02
1.19.4-beta01
1.19.3.1
1.19.3.1-beta01
1.19.3
1.19.3-beta06
1.19.3-beta05
1.19.3-beta04
1.19.3-beta03
1.19.3-beta02
1.19.3-beta01
1.19.2.1
1.19.2
1.19.2-beta02
1.19.2-beta01
1 merge request
!2597
Mr migration of files at startup
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/metering/archives-test.cpp
+21
-0
src/metering/archives-test.cpp
src/metering/archives.cpp
+9
-5
src/metering/archives.cpp
src/metering/metering-test.cpp
+9
-9
src/metering/metering-test.cpp
src/metering/metering.cpp
+16
-7
src/metering/metering.cpp
with
55 additions
and
21 deletions
+55
-21
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets