Skip to content

Commit

Permalink
Revert "common/*Formatters: Split Formatters"
Browse files Browse the repository at this point in the history 
This reverts commit 2b21e3c.

Conflicts:
	src/common/Formatter.cc
	src/common/JSONFormatter.h
	src/common/Makefile.am
	src/common/TableFormatter.h
	src/common/XMLFormatter.cc
	src/common/XMLFormatter.h
	src/rgw/rgw_rest.cc
	src/test/formatter.cc
  • Loading branch information
@yehudasa
yehudasa committed Jan 15, 2016
1 parent 9ced26c commit c145650
Show file tree
Hide file tree
Showing 50 changed files with 877 additions and 675 deletions.
2 changes: 1 addition & 1 deletion ceph-object-corpus
Submodule ceph-object-corpus updated 2 files
+1 −0 archive/10.0.1-587-g8044ad7/forward_incompat/coll_t/0fb478e263d9cc09a9c2148c78bdbb20
+1 −0 archive/10.0.1-587-g8044ad7/forward_incompat/coll_t/3992d8bfa15105a39f0f8295615b0e7f
Loading

0 comments on commit c145650

Please sign in to comment.