fix merge problem
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/commit/39f094d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/39f094d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/39f094d9 Branch: refs/heads/book Commit: 39f094d94903331c660d2c30c0e620f22dd2b099 Parents: 54445c6 64ff918 Author: Lisa Owen <[email protected]> Authored: Thu Oct 27 10:11:18 2016 -0700 Committer: Lisa Owen <[email protected]> Committed: Thu Oct 27 10:11:18 2016 -0700 ---------------------------------------------------------------------- master_middleman/source/subnavs/apache-hawq-nav.erb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/39f094d9/master_middleman/source/subnavs/apache-hawq-nav.erb ---------------------------------------------------------------------- diff --cc master_middleman/source/subnavs/apache-hawq-nav.erb index 1ebe1b6,9bffdf7..1740f3e --- a/master_middleman/source/subnavs/apache-hawq-nav.erb +++ b/master_middleman/source/subnavs/apache-hawq-nav.erb @@@ -364,16 -364,28 +364,8 @@@ <li><a href="/20/pxf/ConfigurePXF.html#credentialsforremoteservices">Credentials for Remote Services</a></li> </ul> </li> - <li class="has_submenu"><a href="/20/pxf/HDFSFileDataPXF.html">Accessing HDFS File Data</a> - <ul> - <li><a href="/20/pxf/HDFSFileDataPXF.html#installingthepxfhdfsplugin">Prerequisites</a></li> - <li><a href="/20/pxf/HDFSFileDataPXF.html#syntax1">Syntax</a></li> - <li><a href="/20/pxf/HDFSFileDataPXF.html#accessingdataonahighavailabilityhdfscluster">Accessing Data on a High Availability HDFS Cluster</a></li> - <li><a href="/20/pxf/HDFSFileDataPXF.html#recordkeyinkey-valuefileformats">Using a Record Key with Key-Value File Formats</a></li> - <li><a href="/20/pxf/HDFSFileDataPXF.html#topic_oy3_qwm_ss">Working with Avro Files</a></li> - </ul> - </li> + <li><a href="/20/pxf/HDFSFileDataPXF.html">Accessing HDFS File Data</a></li> - <li class="has_submenu"><a href="/20/pxf/HivePXF.html">Accessing Hive Data</a> - <ul> - <li><a href="/20/pxf/HivePXF.html#installingthepxfhiveplugin">Prerequisites</a></li> - <li><a href="/20/pxf/HivePXF.html#hivecommandline">Hive Command Line</a></li> - <li class="has_submenu"><a href="/20/pxf/HivePXF.html#topic_p2s_lvl_25">Using PXF Tables to Query Hive</a> - <ul> - <li><a href="/20/pxf/HivePXF.html#syntax2">Syntax Example</a></li> - <li><a href="/20/pxf/HivePXF.html#topic_b4v_g3n_25">Hive Complex Types</a></li> - </ul> - </li> - <li class="has_submenu"><a href="/20/pxf/HivePXF.html#hcatalog">Using PXF and HCatalog to Query Hive</a> - <ul> - <li><a href="/20/pxf/HivePXF.html#topic_j1l_y55_c5">Usage</a></li> - <li><a href="/20/pxf/HivePXF.html#topic_r5k_pst_25">Limitations</a></li> - </ul> - </li> - <li><a href="/20/pxf/HivePXF.html#partitionfiltering">Partition Filtering</a></li> - <li><a href="/20/pxf/HivePXF.html#topic_fdm_zrh_1s">Using PXF with Hive Default Partitions</a></li> - <li><a href="/20/pxf/HivePXF.html#topic_dbb_nz3_ts">Accessing Hive Tables in Parquet Format</a></li> - </ul> - </li> + <li><a href="/20/pxf/HivePXF.html">Accessing Hive Data</a></li> <li class="has_submenu"><a href="/20/pxf/HBasePXF.html">Accessing HBase Data</a> <ul> <li><a href="/20/pxf/HBasePXF.html#installingthepxfhbaseplugin">Prerequisites</a></li>
