SuccessChanges

Summary

  1. Prevent NPE when a merge conflict has a deleted feature. (details)
  2. Fix Travis YML so PostGIS extensions can be setup in PostgreSQL (details)
Commit e381b82eaac46fbaae5de99c1568a06b27f61d72 by Erik Merkle
Prevent NPE when a merge conflict has a deleted feature.
Signed-off-by: Erik Merkle <emerkle@boundlessgeo.com>
The file was modifiedsrc/web/api/src/main/java/org/locationtech/geogig/web/api/PagedMergeScenarioConsumer.java (diff)
The file was modifiedsrc/web/api/src/test/java/org/locationtech/geogig/web/api/TestData.java (diff)
The file was modifiedsrc/web/api/src/test/java/org/locationtech/geogig/web/api/commands/MergeTest.java (diff)
Commit bcefe5dc8d8005ea9af67bd27343d1751931f00b by Erik Merkle
Fix Travis YML so PostGIS extensions can be setup in PostgreSQL
Signed-off-by: Erik Merkle <emerkle@boundlessgeo.com>
The file was modified.travis.yml (diff)