Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: e4b6a04915f5575538c02ea4977ae3bb37126c15 https://github.com/teiid/teiid/commit/e4b6a04915f5575538c02ea4977ae3bb371... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-12-19 (Fri, 19 Dec 2014) Changed paths: 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