diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-07-02 14:42:47 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-07-02 14:42:47 -0400 |
| commit | 5e77a4e38d4b07b019f092ad0e8839b46d1d8d2f (patch) | |
| tree | d59170c298ff49d855e5427c7da13163c4bbd83e /setup.py | |
| parent | 6098591db6f89e7e9123a70a4c1bd951b002176d (diff) | |
| parent | c778b947e9ddb9ea3aa39a2d69c36e90ba9b089e (diff) | |
| download | func-5e77a4e38d4b07b019f092ad0e8839b46d1d8d2f.tar.gz func-5e77a4e38d4b07b019f092ad0e8839b46d1d8d2f.tar.xz func-5e77a4e38d4b07b019f092ad0e8839b46d1d8d2f.zip | |
Merge branch 'kadamski-async2'
Conflicts:
func/overlord/cmd_modules/ping.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -53,6 +53,7 @@ if __name__ == "__main__": ], data_files = [(initpath, ["init-scripts/funcd"]), (etcpath, ["etc/minion.conf"]), + (etcpath, ["etc/async_methods.conf"]), (manpath, ["docs/func.1.gz"]), (manpath, ["docs/func-inventory.1.gz"]), (manpath, ["docs/funcd.1.gz"]), |