Branch: refs/heads/64-8.12.x Home: https://github.com/teiid/teiid Commit: d2be2861f66e0cdfbac3a0ed049384c734919662 https://github.com/teiid/teiid/commit/d2be2861f66e0cdfbac3a0ed049384c7349... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-07-07 (Fri, 07 Jul 2017) Changed paths: M api/src/main/java/org/teiid/language/visitor/HierarchyVisitor.java M connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseConnectionImpl.java M connectors/connector-couchbase/src/main/resources/org/teiid/resource/adapter/couchbase/i18n.properties M connectors/connector-couchbase/src/test/java/org/teiid/resource/adapter/couchbase/TestCouchbaseConnection.java M connectors/couchbase-api/src/main/java/org/teiid/couchbase/CouchbaseConnection.java M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseDirectQueryExecution.java M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseProcedureExecution.java M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseUpdateExecution.java M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java M connectors/translator-couchbase/src/test/resources/N1QL.properties Log Message: ----------- TEIID-4967 TEIID-4969 TEIID-4970 TEIID-4972 TEIID-4973 TEIID-4974 TEIID-4975 addressing various couchbase issues # Conflicts: # connectors/connector-couchbase/src/test/java/org/teiid/resource/adapter/couchbase/TestCouchbaseConnection.java # connectors/couchbase/connector-couchbase/src/main/resources/org/teiid/resource/adapter/couchbase/i18n.properties # connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java # connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java # connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java # connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java