[teiid-commits] [teiid/teiid-documents] bcf47c: Merge branch 'master' into kylin.dev.1

Branch: refs/heads/master Home: https://github.com/teiid/teiid-documents Commit: bcf47c7501e31041a821e1fd6fdc013f417c1892 https://github.com/teiid/teiid-documents/commit/bcf47c7501e31041a821e1fd6... Author: kylinsoong <kylinsoong.1214(a)gmail.com&gt; Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M admin/Migration_Guide_From_Teiid_8.x.adoc M client-dev/OData2_Support.adoc M reference/Translators.adoc Log Message: ----------- Merge branch 'master' into kylin.dev.1 Commit: b529e1f5148d7b83591dc42e2c73c144dbfcd341 https://github.com/teiid/teiid-documents/commit/b529e1f5148d7b83591dc42e2... Author: kylinsoong <kylinsoong.1214(a)gmail.com&gt; Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M caching/External_Materialization.adoc A caching/images/teiid-external-mat.png Log Message: ----------- TEIID-4121: add more details to external ma views doc Commit: 11407120ae853070c5854e411e1b5ceee3660e0d https://github.com/teiid/teiid-documents/commit/11407120ae853070c5854e411... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M caching/External_Materialization.adoc A caching/images/teiid-external-mat.png Log Message: ----------- Merge pull request #46 from kylinsoong/kylin.dev.1 TEIID-4121: add more details to external ma views doc Compare: https://github.com/teiid/teiid-documents/compare/d554f079b465...11407120ae85