[sheepdog] [PATCH v4 0/3] rename collie as dog
Liu Yuan
namei.unix at gmail.com
Tue Aug 13 08:09:47 CEST 2013
v4:
- fix wrong replacement by rebasing
v3:
- remove 'collie' after uninstall
v2:
- add more build/run time requirements in sheepdog.sepc.in
- add compiler.h to Makefile.am
- fix dog/Makefile.am
Rationale:
- 'dog' is shorter to type than 'collie'
- we have a daemon named sheep, and then we have a 'dog' to manage it.
- sheep + dog can be a pun of sheepdog.
This patch set mainly rename collie as dog. No functionality changed at all.
And for compatibility, after 'make install', or install (deb or rpm) package of
sheepdog, a softlink collie that points to 'dog' binary will be created.
This patch set also fixes the failure of 'make rpm'.
Liu Yuan (3):
rename collie as dog
symlink dog to collie for compatibility
fix 'make rpm'
.gitignore | 6 +-
INSTALL | 2 +-
Makefile.am | 10 +-
README | 12 +-
collie/Makefile.am | 56 -
collie/cluster.c | 524 ---------
collie/collie.c | 433 --------
collie/collie.h | 97 --
collie/common.c | 324 ------
collie/farm/farm.c | 410 --------
collie/farm/farm.h | 83 --
collie/farm/object_tree.c | 124 ---
collie/farm/sha1_file.c | 148 ---
collie/farm/slice.c | 109 --
collie/farm/snap.c | 127 ---
collie/farm/trunk.c | 84 --
collie/node.c | 417 --------
collie/trace.c | 387 -------
collie/treeview.c | 188 ----
collie/treeview.h | 21 -
collie/vdi.c | 2160 --------------------------------------
configure.ac | 6 +-
debian/sheepdog.bash-completion | 2 +-
debian/sheepdog.postinst | 2 +
debian/sheepdog.postrm | 2 +
dog/Makefile.am | 62 ++
dog/cluster.c | 524 +++++++++
dog/common.c | 324 ++++++
dog/dog.c | 433 ++++++++
dog/dog.h | 97 ++
dog/farm/farm.c | 410 ++++++++
dog/farm/farm.h | 83 ++
dog/farm/object_tree.c | 124 +++
dog/farm/sha1_file.c | 148 +++
dog/farm/slice.c | 109 ++
dog/farm/snap.c | 127 +++
dog/farm/trunk.c | 84 ++
dog/node.c | 417 ++++++++
dog/trace.c | 387 +++++++
dog/treeview.c | 188 ++++
dog/treeview.h | 21 +
dog/vdi.c | 2160 ++++++++++++++++++++++++++++++++++++++
include/Makefile.am | 2 +-
include/internal_proto.h | 4 +-
lib/logger.c | 2 +-
man/Makefile.am | 10 +-
man/collie.8.in | 37 -
man/dog.8.in | 37 +
man/sheep.8.in | 4 +-
man/sheepfs.8.in | 4 +-
script/Makefile.am | 2 +-
script/bash_completion_collie | 303 ------
script/bash_completion_dog | 303 ++++++
sheep/sheep.c | 2 +-
sheep/store.c | 2 +-
sheepdog.spec.in | 18 +-
sheepfs/cluster.c | 2 +-
sheepfs/node.c | 4 +-
sheepfs/vdi.c | 2 +-
sheepfs/volume.c | 2 +-
tests/dynamorio/journaling/01.sh | 4 +-
tests/functional/001 | 2 +-
tests/functional/002 | 2 +-
tests/functional/003 | 2 +-
tests/functional/004 | 2 +-
tests/functional/005 | 4 +-
tests/functional/006 | 2 +-
tests/functional/007 | 6 +-
tests/functional/008 | 6 +-
tests/functional/009 | 6 +-
tests/functional/010 | 32 +-
tests/functional/011 | 2 +-
tests/functional/012 | 2 +-
tests/functional/014 | 12 +-
tests/functional/015 | 48 +-
tests/functional/016 | 10 +-
tests/functional/017 | 2 +-
tests/functional/018 | 8 +-
tests/functional/019 | 6 +-
tests/functional/020 | 4 +-
tests/functional/022 | 2 +-
tests/functional/023 | 4 +-
tests/functional/024 | 2 +-
tests/functional/025 | 4 +-
tests/functional/026 | 6 +-
tests/functional/027 | 4 +-
tests/functional/028 | 18 +-
tests/functional/029 | 12 +-
tests/functional/030 | 62 +-
tests/functional/031 | 4 +-
tests/functional/032 | 8 +-
tests/functional/033 | 8 +-
tests/functional/034 | 10 +-
tests/functional/035 | 12 +-
tests/functional/036 | 6 +-
tests/functional/037 | 8 +-
tests/functional/038 | 8 +-
tests/functional/039 | 34 +-
tests/functional/040 | 2 +-
tests/functional/041 | 46 +-
tests/functional/042 | 14 +-
tests/functional/043 | 24 +-
tests/functional/044 | 42 +-
tests/functional/045 | 8 +-
tests/functional/046 | 24 +-
tests/functional/047 | 10 +-
tests/functional/048 | 20 +-
tests/functional/049 | 6 +-
tests/functional/050 | 8 +-
tests/functional/051 | 6 +-
tests/functional/052 | 16 +-
tests/functional/053 | 10 +-
tests/functional/054 | 6 +-
tests/functional/055 | 26 +-
tests/functional/056 | 18 +-
tests/functional/057 | 24 +-
tests/functional/058 | 8 +-
tests/functional/059 | 8 +-
tests/functional/060 | 16 +-
tests/functional/061 | 4 +-
tests/functional/062 | 36 +-
tests/functional/063 | 12 +-
tests/functional/064 | 16 +-
tests/functional/065 | 6 +-
tests/functional/066 | 12 +-
tests/functional/067 | 4 +-
tests/functional/068 | 6 +-
tests/functional/069 | 6 +-
tests/functional/070 | 4 +-
tests/functional/071 | 6 +-
tests/functional/072 | 6 +-
tests/functional/check | 2 +-
tests/functional/common.config | 4 +-
tests/functional/common.filter | 2 +-
tests/functional/common.rc | 24 +-
tests/functional/group | 4 +-
tests/unit/Makefile.am | 2 +-
tests/unit/collie/Makefile.am | 23 -
tests/unit/collie/mock_collie.c | 25 -
tests/unit/collie/test_common.c | 56 -
tests/unit/dog/Makefile.am | 23 +
tests/unit/dog/mock_dog.c | 25 +
tests/unit/dog/test_common.c | 56 +
143 files changed, 6633 insertions(+), 6619 deletions(-)
delete mode 100644 collie/Makefile.am
delete mode 100644 collie/cluster.c
delete mode 100644 collie/collie.c
delete mode 100644 collie/collie.h
delete mode 100644 collie/common.c
delete mode 100644 collie/farm/farm.c
delete mode 100644 collie/farm/farm.h
delete mode 100644 collie/farm/object_tree.c
delete mode 100644 collie/farm/sha1_file.c
delete mode 100644 collie/farm/slice.c
delete mode 100644 collie/farm/snap.c
delete mode 100644 collie/farm/trunk.c
delete mode 100644 collie/node.c
delete mode 100644 collie/trace.c
delete mode 100644 collie/treeview.c
delete mode 100644 collie/treeview.h
delete mode 100644 collie/vdi.c
create mode 100644 dog/Makefile.am
create mode 100644 dog/cluster.c
create mode 100644 dog/common.c
create mode 100644 dog/dog.c
create mode 100644 dog/dog.h
create mode 100644 dog/farm/farm.c
create mode 100644 dog/farm/farm.h
create mode 100644 dog/farm/object_tree.c
create mode 100644 dog/farm/sha1_file.c
create mode 100644 dog/farm/slice.c
create mode 100644 dog/farm/snap.c
create mode 100644 dog/farm/trunk.c
create mode 100644 dog/node.c
create mode 100644 dog/trace.c
create mode 100644 dog/treeview.c
create mode 100644 dog/treeview.h
create mode 100644 dog/vdi.c
delete mode 100644 man/collie.8.in
create mode 100644 man/dog.8.in
delete mode 100644 script/bash_completion_collie
create mode 100644 script/bash_completion_dog
delete mode 100644 tests/unit/collie/Makefile.am
delete mode 100644 tests/unit/collie/mock_collie.c
delete mode 100644 tests/unit/collie/test_common.c
create mode 100644 tests/unit/dog/Makefile.am
create mode 100644 tests/unit/dog/mock_dog.c
create mode 100644 tests/unit/dog/test_common.c
--
1.7.9.5
More information about the sheepdog
mailing list