[teiid-commits] [teiid/teiid] 5f90c0: TEIID-4983 updating ordering in the unit tests

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 5f90c0ee04d7514540a40efa79038f63a2df1c2c
      https://github.com/teiid/teiid/commit/5f90c0ee04d7514540a40efa79038f63a2df1c2c
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-10 (Mon, 10 Jul 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/TestCouchbaseMetadataProcessor.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


  Commit: bfdf1bf68e0c164b58844a9b19766e3ed1257b78
      https://github.com/teiid/teiid/commit/bfdf1bf68e0c164b58844a9b19766e3ed1257b78
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M admin/src/main/resources/org/teiid/adminapi/i18n.properties
    A connectors/infinispan/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanDirectQueryExecution.java
    M connectors/infinispan/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanExecutionFactory.java
    M connectors/infinispan/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanPlugin.java
    M connectors/infinispan/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanQueryExecution.java
    M connectors/infinispan/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/InfinispanUpdateExecution.java
    M connectors/infinispan/translator-infinispan-hotrod/src/main/java/org/teiid/translator/infinispan/hotrod/ProtobufMetadataProcessor.java
    M connectors/infinispan/translator-infinispan-hotrod/src/main/resources/org/teiid/translator/infinispan/hotrod/i18n.properties

  Log Message:
  -----------
  Merge branch 'master' of github.com:teiid/teiid


Compare: https://github.com/teiid/teiid/compare/8cb41f5060bf...bfdf1bf68e0c