Branch: refs/heads/8.4.x Home: https://github.com/teiid/teiid Commit: 208a274d8c198a1f6bb81d84931cccc4dacb31c8 https://github.com/teiid/teiid/commit/208a274d8c198a1f6bb81d84931cccc4dac... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-01-09 (Fri, 09 Jan 2015) Changed paths: M build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java M engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java Log Message: ----------- TEIID-3267: OPTION NOCACHE causes ConcurrentModificationException Conflicts: engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java