Clone
Sandhya Sundaresan <sandhya@apache.org>
committed
on 08 May 17
Merge remote branch 'origin/release2.1'
Conflicts:
core/conn/jdbcT4/pom.xml
docs/sql_reference/src/asciidoc/_chapters/olap_functions.adoc… Show more
Merge remote branch 'origin/release2.1'

Conflicts:

        core/conn/jdbcT4/pom.xml

        docs/sql_reference/src/asciidoc/_chapters/olap_functions.adoc

        docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc

        install/python-installer/db_uninstall.py

        install/python-installer/scripts/copy_files.py

        install/python-installer/scripts/hdfs_cmds.py

        install/python-installer/scripts/traf_check.py

        install/python-installer/scripts/traf_ldap.py

        install/python-installer/scripts/traf_setup.py

        install/python-installer/scripts/traf_user.py

        install/python-installer/scripts/wrapper.py

Show less

default + 4 more