[mapserver-commits] [mapserver/mapserver] 022d24: Backport #4928 and #5356

[GitHub]

  Branch: refs/heads/branch-7-0
  Home:   https://github.com/mapserver/mapserver
  Commit: 022d24bd34196b6dca67053fb797a6980210bc54
      https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb797a6980210bc54
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M mapogr.cpp
    M mappostgis.c

  Log Message:
  -----------
  Backport #4928 and #5356


  Commit: 3cf2cea402442de4c606b4192034447355cae8c4
      https://github.com/mapserver/mapserver/commit/3cf2cea402442de4c606b4192034447355cae8c4
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M mappostgis.c

  Log Message:
  -----------
  Merge branch 'branch-6-4' into branch-7-0


  Commit: e9d06071b534a8658ee1e5498f945b9995a125df
      https://github.com/mapserver/mapserver/commit/e9d06071b534a8658ee1e5498f945b9995a125df
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  7-0 backport: Fix travis builds, remove 5.6 until build fix is worked on


  Commit: a6bc35db5ac38bd58d269bdd00efd3816f0a1df4
      https://github.com/mapserver/mapserver/commit/a6bc35db5ac38bd58d269bdd00efd3816f0a1df4
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Log Message:
  -----------
  No-op: Merge branch 'branch-6-4' into branch-7-0


Compare: https://github.com/mapserver/mapserver/compare/491397c126eb...a6bc35db5ac3