Skip to content
Snippets Groups Projects
Commit 9e22d661 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 a504a00a f2f0d50a
No related branches found
No related tags found
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.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use