Merge branch 'kadamski-async2'

Conflicts:

	func/overlord/cmd_modules/ping.py

1 files changed, 1 insertions, 0 deletions

diff --git a/func.spec b/func.spec
index 414fa07..2d242b9 100644
--- a/func.spec
+++ b/func.spec
@@ -60,6 +60,7 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/%{name}/minion-acl.d/
 %dir /etc/func/modules/
 %config(noreplace) /etc/func/minion.conf
+%config(noreplace) /etc/func/async_methods.conf
 %config(noreplace) /etc/logrotate.d/func_rotate
 %dir %{python_sitelib}/func
 %dir %{python_sitelib}/func/minion