Merge branch '189-dbexecutor' into 'master' (d46ad6cc) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

d46ad6cc

Commit d46ad6cc authored 9 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '189-dbexecutor' into 'master'

Inject dbExecutor as ExecutorService

Closes #188, despite the branch name. :0)

See merge request !33

parents 435efc3b b7fe802d

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

briar-core/src/org/briarproject/db/DatabaseModule.java 6 additions, 1 deletion

briar-core/src/org/briarproject/db/DatabaseModule.java
briar-core/src/org/briarproject/transport/KeyManagerImpl.java 3 additions, 3 deletions

...r-core/src/org/briarproject/transport/KeyManagerImpl.java
briar-core/src/org/briarproject/transport/TransportKeyManager.java 47 additions, 15 deletions

...e/src/org/briarproject/transport/TransportKeyManager.java

with 56 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment