Branch: refs/heads/9.3.x Home: https://github.com/teiid/teiid Commit: f84f6eb2244024088167e492f0bbef056ea902c3 https://github.com/teiid/teiid/commit/f84f6eb2244024088167e492f0bbef056ea... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-08-31 (Thu, 31 Aug 2017) Changed paths: M connectors/couchbase/translator-couchbase/src/test/resources/complexJson.expected Log Message: ----------- TEIID-4983 updating ordering in the unit tests # Conflicts: # connectors/couchbase/translator-couchbase/src/test/resources/complexJson.expected