[Pywps-dev] github updates

[Jachym Cepicky]

Jan: I would accept your version, not trying to merge my changes with yours

čt 7. 7. 2016 v 13:12 odesílatel Jan Rudolf <rudolja1 at fit.cvut.cz> napsal:

> Hi Jachym,
>
> dblog.py: I don't know, if it's a good idea merging my version of
> dblog.py because I've switched to ORM, there are no explicit SQL
> queries. The ORM is dependant of pywps/server/app/__init__.py. I will
> try to rebase, hope, there aren't going to be any complications.
>
> Jan
>
>
> On 2016-07-06 13:35, Jachym Cepicky wrote:
> > Hi GSoC students Vikas and Jan,
> >
> > I've merged two pull requests - you might try git rebase your branches
> > to current master, to avoid future conflicts
> >
> > Jan: I assume, dblog.py will be a big mess, since I did some changes
> > there too. Will probably move to your version of the file completely
> > (I did just some input sanitation)
> >
> > J
> _______________________________________________
> pywps-dev mailing list
> pywps-dev at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/pywps-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/pywps-dev/attachments/20160707/d87e758a/attachment.html>