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
3b09455b
Commit
3b09455b
authored
4 years ago
by
Jenkins
Browse files
Options
Download
Plain Diff
Merge branch 'master' into 'testing'
Merge branch 'master' into testing See merge request
!2395
parents
bc5c7ad4
70879a0f
testing_safe
R2011
R2102
R2106
R2111
R2204
R2207
cherry-pick-76f3d2ce
cherry-pick-921e00cb
cherry-pick-921e00cb-2
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.19.1
1.19.1-beta02
1.19.1-beta01
1.19.0
1.19.0-beta03
1.19.0-beta02
1.19.0-beta01
1.18.0
1.18.0-beta04
1.18.0-beta03
1.18.0-beta02
1.18.0-beta01
1.17.0
1.17.0-beta05
1.17.0-beta04
1.17.0-beta03
1.17.0-beta02
1.17.0-beta01
1 merge request
!2395
Merge branch 'master' into testing
Changes
11
Pipelines
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
docker/Dockerfile
+5
-0
docker/Dockerfile
external/trompeloeil.hpp
+227
-144
external/trompeloeil.hpp
src/cache/apartment-proxy-test.cpp
+290
-68
src/cache/apartment-proxy-test.cpp
src/cache/apartment-proxy.cpp
+28
-56
src/cache/apartment-proxy.cpp
src/ds-apartment/remote-connectivity.cpp
+41
-34
src/ds-apartment/remote-connectivity.cpp
src/ds-api/http-server.cpp
+10
-2
src/ds-api/http-server.cpp
src/ds-model/groups.h
+7
-0
src/ds-model/groups.h
src/ds-model/remote-connectivity-fwd.h
+4
-11
src/ds-model/remote-connectivity-fwd.h
src/ds-model/remote-connectivity.cpp
+0
-2
src/ds-model/remote-connectivity.cpp
src/ds-model/remote-connectivity.h
+0
-37
src/ds-model/remote-connectivity.h
src/ds-net/tcp-acceptor-test.cpp
+1
-1
src/ds-net/tcp-acceptor-test.cpp
with
613 additions
and
355 deletions
+613
-355
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