[teiid-commits] [teiid/teiid] 983ac9: Changes related to importing 2 new bom's

Branch: refs/heads/8.4.x Home: https://github.com/teiid/teiid Commit: 983ac9ca8bd8f157c57b1937a7b22a2160c4c4f3 https://github.com/teiid/teiid/commit/983ac9ca8bd8f157c57b1937a7b22a2160c... Author: vhalbert <vhalbert(a)redhat.com&gt; Date: 2013-10-17 (Thu, 17 Oct 2013) Changed paths: M connectors/connector-infinispan/pom.xml M connectors/translator-object/pom.xml M hibernate-dialect/pom.xml M pom.xml M runtime/pom.xml Log Message: ----------- Changes related to importing 2 new bom's Commit: 5e78010b8c6e40e38ee0a43f58bcbda34503b113 https://github.com/teiid/teiid/commit/5e78010b8c6e40e38ee0a43f58bcbda3450... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-10-18 (Fri, 18 Oct 2013) Changed paths: M connectors/translator-object/pom.xml M pom.xml Log Message: ----------- Merge branch 'rebasePomChanges' of https://github.com/vhalbert/teiid into 8.4.x Conflicts: connectors/translator-object/pom.xml pom.xml Compare: https://github.com/teiid/teiid/compare/95fabcdcf0bc...5e78010b8c6e