[teiid-commits] [teiid/teiid] 85ced8: TEIID-5041 addressing couchbase and batched update...

[shawkins]

  Branch: refs/heads/64-8.12.x
  Home:   https://github.com/teiid/teiid
  Commit: 85ced82028704918e8933c232bb7faff81cd4fd1
      https://github.com/teiid/teiid/commit/85ced82028704918e8933c232bb7faff81cd4fd1
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    M engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
    M engine/src/main/java/org/teiid/query/eval/Evaluator.java
    M engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java
    M engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatementBatchedUpdate.java
    M engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java

  Log Message:
  -----------
  TEIID-5041 addressing couchbase and batched update planning in general
# Conflicts:
#	connectors/couchbase/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
#	connectors/couchbase/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
#	connectors/couchbase/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
#	engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java