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 ++--
configure.ac | 6 +-
debian/sheepdog.bash-completion | 2 +-
debian/sheepdog.postinst | 2 +
{collie => dog}/Makefile.am | 26 ++++----
{collie => dog}/cluster.c | 14 ++---
{collie => dog}/common.c | 14 ++---
collie/collie.c => dog/dog.c | 16 ++---
collie/collie.h => dog/dog.h | 6 +-
{collie => dog}/farm/farm.c | 4 +-
{collie => dog}/farm/farm.h | 2 +-
{collie => dog}/farm/object_tree.c | 2 +-
{collie => dog}/farm/sha1_file.c | 0
{collie => dog}/farm/slice.c | 0
{collie => dog}/farm/snap.c | 0
{collie => dog}/farm/trunk.c | 0
{collie => dog}/node.c | 12 ++--
{collie => dog}/trace.c | 12 ++--
{collie => dog}/treeview.c | 0
{collie => dog}/treeview.h | 0
{collie => dog}/vdi.c | 24 ++++----
include/internal_proto.h | 4 +-
lib/logger.c | 2 +-
man/Makefile.am | 10 +--
man/{collie.8.in => dog.8.in} | 10 +--
man/sheep.8.in | 4 +-
man/sheepfs.8.in | 4 +-
script/Makefile.am | 2 +-
...{bash_completion_collie => bash_completion_dog} | 64 ++++++++++----------
sheep/sheep.c | 2 +-
sheep/store.c | 2 +-
sheepdog.spec.in | 12 ++--
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 => dog}/Makefile.am | 10 +--
.../unit/{collie/mock_collie.c => dog/mock_dog.c} | 4 +-
tests/unit/{collie => dog}/test_common.c | 2 +-
119 files changed, 597 insertions(+), 589 deletions(-)
rename {collie => dog}/Makefile.am (65%)
rename {collie => dog}/cluster.c (97%)
rename {collie => dog}/common.c (95%)
rename collie/collie.c => dog/dog.c (96%)
rename collie/collie.h => dog/dog.h (96%)
rename {collie => dog}/farm/farm.c (99%)
rename {collie => dog}/farm/farm.h (99%)
rename {collie => dog}/farm/object_tree.c (99%)
rename {collie => dog}/farm/sha1_file.c (100%)
rename {collie => dog}/farm/slice.c (100%)
rename {collie => dog}/farm/snap.c (100%)
rename {collie => dog}/farm/trunk.c (100%)
rename {collie => dog}/node.c (97%)
rename {collie => dog}/trace.c (96%)
rename {collie => dog}/treeview.c (100%)
rename {collie => dog}/treeview.h (100%)
rename {collie => dog}/vdi.c (98%)
rename man/{collie.8.in => dog.8.in} (78%)
rename script/{bash_completion_collie => bash_completion_dog} (83%)
rename tests/unit/{collie => dog}/Makefile.am (62%)
rename tests/unit/{collie/mock_collie.c => dog/mock_dog.c} (95%)
rename tests/unit/{collie => dog}/test_common.c (98%)
--
1.7.9.5
|
|