[teiid-commits] [teiid/teiid] 847e11: TEIID-2152 initial merge support

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 847e11e30a68fdbc92fa02392c582b7a0dc6dfa4
      https://github.com/teiid/teiid/commit/847e11e30a68fdbc92fa02392c582b7a0dc6dfa4
  Author: shawkins <shawkins at redhat.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M admin/src/main/java/org/teiid/adminapi/DataPolicy.java
    M build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
    M client/src/test/java/org/teiid/jdbc/util/ResultSetUtil.java
    M engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/main/java/org/teiid/query/sql/lang/Insert.java
    M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
    M engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
    M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java
    M engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
    M engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java
    M engine/src/test/java/org/teiid/query/validator/TestValidator.java
    M test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java

  Log Message:
  -----------
  TEIID-2152 initial merge support