Permalink
Browse files

Revert "common/*Formatters: Split Formatters"

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...
1 parent 9ced26c commit c145650884f1b115c460ea1e6d64306b9217652a @yehudasa yehudasa committed Jan 15, 2016
Showing with 877 additions and 675 deletions.
  1. +1 −1 ceph-object-corpus
  2. +748 −5 src/common/Formatter.cc
  3. +123 −0 src/common/Formatter.h
  4. +0 −226 src/common/JSONFormatter.cc
  5. +0 −6 src/common/Makefile.am
  6. +0 −376 src/common/TableFormatter.cc
  7. +0 −1 src/common/admin_socket.cc
  8. +0 −1 src/mds/MDSDaemon.cc
  9. +0 −2 src/mds/MDSRank.cc
  10. +0 −1 src/mon/ConfigKeyService.cc
  11. +0 −2 src/mon/Monitor.cc
  12. +0 −1 src/mon/Paxos.cc
  13. +0 −3 src/mon/Paxos.h
  14. +0 −2 src/os/FileJournal.cc
  15. +0 −2 src/os/FileStore.cc
  16. +0 −2 src/os/FileStore.h
  17. +0 −2 src/os/KeyValueStore.cc
  18. +0 −1 src/os/KeyValueStore.h
  19. +0 −2 src/os/MemStore.cc
  20. +0 −2 src/osd/OSD.cc
  21. +0 −1 src/osd/OSDMap.cc
  22. +0 −2 src/rbd.cc
  23. +0 −2 src/rgw/rgw_admin.cc
  24. +0 −1 src/rgw/rgw_cors_s3.h
  25. +0 −1 src/rgw/rgw_jsonparser.cc
  26. +0 −1 src/rgw/rgw_log.cc
  27. +0 −2 src/rgw/rgw_rest.cc
  28. +0 −1 src/rgw/rgw_rest_s3.cc
  29. +0 −1 src/rgw/rgw_swift.cc
  30. +0 −1 src/rgw/rgw_swift_auth.cc
  31. +1 −1 src/rocksdb
  32. +0 −1 src/test/bench/small_io_bench.cc
  33. +0 −1 src/test/bench/small_io_bench_dumb.cc
  34. +0 −1 src/test/bench/small_io_bench_fs.cc
  35. +0 −1 src/test/bench/small_io_bench_rbd.cc
  36. +0 −1 src/test/bench/tp_bench.cc
  37. +1 −1 src/test/common/test_tableformatter.cc
  38. +0 −1 src/test/crush/crush.cc
  39. +0 −1 src/test/encoding/ceph_dencoder.cc
  40. +1 −2 src/test/formatter.cc
  41. +0 −1 src/test/kv_store_bench.h
  42. +0 −1 src/test/mon/test_mon_workloadgen.cc
  43. +0 −2 src/test/test_rgw_admin_meta.cc
  44. +1 −1 src/tools/ceph-client-debug.cc
  45. +1 −1 src/tools/ceph_monstore_tool.cc
  46. +0 −1 src/tools/ceph_objectstore_tool.cc
  47. +0 −1 src/tools/cephfs/EventOutput.cc
  48. +0 −1 src/tools/cephfs/JournalTool.cc
  49. +0 −2 src/tools/cephfs/TableTool.cc
  50. +0 −2 src/tools/rados/rados.cc

0 comments on commit c145650

Please sign in to comment.