Skip to content
Snippets Groups Projects
Commit 120f3b64 authored by Eric Cano's avatar Eric Cano
Browse files

Merge branch 'master' into bulkGCmerge and completed bulk garbage collection. 

Conflicts:
	objectstore/BackendRados.hpp
	objectstore/BackendVFS.hpp
	objectstore/GarbageCollector.cpp
	objectstore/GenericObject.cpp
parents a3a02a51 5588cda6
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1140 additions and 148 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

imprint | privacy | Conditions of Use