Clone
Steven Hawkins
committed
on 13 Oct 16
Merge branch 'TEIID-4511' of https://github.com/asmigala/teiid
# Conflicts:
# test-integration/common/src/test/resources/TestMMDatabaseMetaD… Show more
Merge branch 'TEIID-4511' of https://github.com/asmigala/teiid

# Conflicts:

#       test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected

#       test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected

Show less

master + 18 more