Branch: refs/heads/8.13.x Home: https://github.com/teiid/teiid Commit: e168067a4241cc801e8a351fa7725e33f72d24bf https://github.com/teiid/teiid/commit/e168067a4241cc801e8a351fa7725e33f72... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M engine/src/main/java/org/teiid/dqp/internal/process/Request.java M engine/src/main/java/org/teiid/query/metadata/TempCapabilitiesFinder.java Log Message: ----------- TEIID-4118 refining to use the engine value Conflicts: engine/src/main/java/org/teiid/query/metadata/TempCapabilitiesFinder.java