Re: master broken

[Steve Salevan <steve@xxxxxxxxxx>]

Most of these were changes which were intentionally merged in as part of the ixs-delegation merge, which was outstanding for some time and contained some useful bugfixes and improvements to the delegation codebase, particularly around delegation path determination and parallelization during delegation calls.  Reviewing the diff you supplied, it appears that most of the code in it covered these changes; however, testsingle.py is definitely some old code and came back, like a zombie, with this merge, so I've removed it from master.

At the moment, it looks as if we're back to a happy state; thanks much for your vigilance, be sure to let me know if you see anything else that looks strange.

On Fri, Feb 8, 2013 at 1:41 PM, S.Çağlar Onur <caglar@xxxxxxxx> wrote:

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@xxxxxxxxxx> 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@xxxxxxxx> wrote:

Steve,

It looks like you accidentally merged an old branch (xs-delegation) into master [1] and it made things bad as commit contains non python code.

[1] http://git.fedorahosted.org/cgit/func.git/commit/?id=9a0ae4446ff1b9ad7bccc57ddfb3c765fa68ebbf

Cheers,

--
S.Çağlar Onur <caglar@xxxxxxxx>

_______________________________________________
func mailing list
func@xxxxxxxxxxxxxxxxxxxxxx
https://lists.fedorahosted.org/mailman/listinfo/func

--

Steve Salevan

steve@xxxxxxxxxx

_______________________________________________
func mailing list
func@xxxxxxxxxxxxxxxxxxxxxx
https://lists.fedorahosted.org/mailman/listinfo/func

--

S.Çağlar Onur <caglar@xxxxxxxx>

_______________________________________________
func mailing list
func@xxxxxxxxxxxxxxxxxxxxxx
https://lists.fedorahosted.org/mailman/listinfo/func

--

Steve Salevan

steve@xxxxxxxxxx

_______________________________________________
func mailing list
func@xxxxxxxxxxxxxxxxxxxxxx
https://lists.fedorahosted.org/mailman/listinfo/func