Branch: refs/heads/64-8.12.x Home: https://github.com/teiid/teiid Commit: ad0ee8715dc210ff25bad5306f7997ed6cc65f79 https://github.com/teiid/teiid/commit/ad0ee8715dc210ff25bad5306f7997ed6cc... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-09-29 (Fri, 29 Sep 2017) Changed paths: M connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java M connectors/translator-file/src/test/java/org/teiid/translator/file/TestFileExecutionFactory.java Log Message: ----------- TEIID-4857 adding file metadata to the resultset # Conflicts: # connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java Commit: f81d69e1bd7025f2096bf648b4b76432c4af50a1 https://github.com/teiid/teiid/commit/f81d69e1bd7025f2096bf648b4b76432c4a... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-09-29 (Fri, 29 Sep 2017) Changed paths: M connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java M connectors/translator-file/src/test/java/org/teiid/translator/file/TestFileExecutionFactory.java Log Message: ----------- TEIID-4857 adding a backwards compatibility check # Conflicts: # connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java # connectors/translator-file/src/test/java/org/teiid/translator/file/TestFileExecutionFactory.java Compare: https://github.com/teiid/teiid/compare/a895e8ae52c9...f81d69e1bd70