Branch: refs/heads/9.3.x Home: https://github.com/teiid/teiid Commit: 4177c39596e32835a50cc8ac4a87537c21ee6430 https://github.com/teiid/teiid/commit/4177c39596e32835a50cc8ac4a87537c21e... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-08-31 (Thu, 31 Aug 2017) Changed paths: M connectors/couchbase/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java M connectors/couchbase/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java M connectors/couchbase/translator-couchbase/src/test/resources/N1QL.properties M connectors/couchbase/translator-couchbase/src/test/resources/complexJson.expected M connectors/couchbase/translator-couchbase/src/test/resources/complexJsonNestedArray.expected M connectors/couchbase/translator-couchbase/src/test/resources/customerDuplicatedTypedName.expected M connectors/couchbase/translator-couchbase/src/test/resources/customerOrder.expected M connectors/couchbase/translator-couchbase/src/test/resources/customerOrderTypedName.expected M connectors/couchbase/translator-couchbase/src/test/resources/dataTypeJson.expected M connectors/couchbase/translator-couchbase/src/test/resources/moreTypedNameInOneKeyspace.expected M connectors/couchbase/translator-couchbase/src/test/resources/nestedJson.expected M connectors/couchbase/translator-couchbase/src/test/resources/nestedJsonTypedName.expected M connectors/couchbase/translator-couchbase/src/test/resources/nullValue.expected Log Message: ----------- TEIID-4983 updating ordering in the unit tests # Conflicts: # connectors/couchbase/translator-couchbase/src/test/resources/complexJson.expected