{"push_id":1471655719,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"d2d5b4f1a6f6b251bd822c3e59cda1b7bec9104f","before":"40496980e1883e872d50e615f7c1bf5ac0577f0c","commits":[{"sha":"6cf9468870936c7ee8229208e50ff16c85faab3f","author":{"name":"Yann E. MORIN","email":"5914afe43711f8d3ab584c09509bb25676fff3d1@free.fr"},"message":"bin/pwclient: accept alternate http_proxy forms\n\nThe forms for http_proxy (and the likes) is not very well defined nor\ndocumented in any authoritaive place. However, there are two common\nforms:  http://host:port  or  http://host:port/\n\nCurrently, the code chokes on the latter (e.g. with\nhttp_proxy=http://127.0.0.1:8080/ ):\n\n    [...]\n      File \"/usr/lib/python2.7/httplib.py\", line 792, in _get_hostport\n        raise InvalidURL(\"nonnumeric port: '%s'\" % host[i+1:])\n    httplib.InvalidURL: nonnumeric port: '8080/'\n\nChop off any slash character in the port definition to accept the second\nform. If there is no '/' in there, it still works.\n\nSigned-off-by: \"Yann E. MORIN\" <yann.morin.1998@free.fr>\nSigned-off-by: Stephen Finucane <stephenfinucane@hotmail.com>","distinct":true,"url":"https://api.github.com/repos/getpatchwork/patchwork/commits/6cf9468870936c7ee8229208e50ff16c85faab3f"},{"sha":"d2d5b4f1a6f6b251bd822c3e59cda1b7bec9104f","author":{"name":"Matthias Brugger","email":"1c894d4fbb58f2695998c42a5db0673cda7ecc28@suse.com"},"message":"pwclient: support 3-way merge\n\nAdd support for the 3-way merge in git-am.\nThis can be done via\n  - the commandline\n  - the global option section\n  - the per-project section\n\nSigned-off-by: Matthias Brugger <mbrugger@suse.com>\nReviewed-by: Stephen Finucane <stephen@that.guru>","distinct":true,"url":"https://api.github.com/repos/getpatchwork/patchwork/commits/d2d5b4f1a6f6b251bd822c3e59cda1b7bec9104f"}]}
{"actor":{"display_login":"stephenfin"}}