Hmm it still looks like there are some artifacts in the repo. My local copy
was at 4cce9c5b796a0f1f2205deb391b088d7a3e066b6 before the merge and now it
shows following diff
[caglar@kokai:~/Projects/fedoraproject/func(master)] git diff
4cce9c5b796a0f1f2205deb391b088d7a3e066b6 | diffstat
minion/AuthedXMLRPCServer.py | 2
minion/modules/delegation.py | 47 ++++++++-----
minion/modules/func_module.py | 2
minion/modules/testsingle.py | 147
++++++++++++++++++++++++++++++++++++++++++
overlord/client.py | 39 ++++++-----
overlord/cmd_modules/call.py | 2
overlord/delegation_tools.py | 32 +++++----
overlord/mapper.py | 10 ++
overlord/sslclient.py | 2
utils.py | 2
yaml/implicit.py | 5 +
11 files changed, 237 insertions(+), 53 deletions(-)
I'm not %100 sure those are the things we want in the master.
On Fri, Feb 8, 2013 at 1:14 PM, Steve Salevan <steve(a)tumblr.com> wrote:
Hey man,
Thanks hugely for discovering this; I have corrected the merge conflict
and pushed a commit up to master to unbreak Func.
On Fri, Feb 8, 2013 at 12:55 PM, S.Çağlar Onur <caglar(a)10ur.org> wrote:
> Steve,
>
> It looks like you accidentally merged an old branch
(
xs-delegation<http://git.fedorahosted.org/cgit/func.git/commit/>) into
> master [1] and it made things bad as commit contains non python code.
>
> [1]
>
http://git.fedorahosted.org/cgit/func.git/commit/?id=9a0ae4446ff1b9ad7bcc...
>
> Cheers,
> --
> S.Çağlar Onur <caglar(a)10ur.org>
>
> _______________________________________________
> func mailing list
> func(a)lists.fedorahosted.org
>
https://lists.fedorahosted.org/mailman/listinfo/func
>
--
Steve Salevan
steve(a)tumblr.com
_______________________________________________
func mailing list
func(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/func
--
S.Çağlar Onur <caglar(a)10ur.org>