This is an automated email from the ASF dual-hosted git repository. apilloud pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
commit 6429412228d91f0f03340e59cb01508b7fe70ecf Merge: 943dc60 5ab3ed8 Author: Andrew Pilloud <apill...@users.noreply.github.com> AuthorDate: Mon Aug 6 13:28:50 2018 -0700 Merge pull request #6139 from amaliujia/rui_wang-remove_RelCollationTraitDef [BEAM-5072][SQL]Remove RelCollationTraitDef configuration in BeamQueryPlanner .../beam/sdk/extensions/sql/impl/BeamQueryPlanner.java | 4 +--- .../apache/beam/sdk/extensions/sql/impl/JdbcDriver.java | 14 ++++++++++++++ .../beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java | 4 ++-- .../sql/impl/interpreter/BeamSqlFnExecutorTestBase.java | 4 +--- 4 files changed, 18 insertions(+), 8 deletions(-)