Merge remote-tracking branch 'upstream/develop' into feature/pxfinstall-upd
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/e169704e Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/e169704e Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/e169704e Branch: refs/heads/develop Commit: e169704e14d43a19b6c0c35900c1d16947a45901 Parents: 7b30fc7 81b1ef8 Author: Lisa Owen <[email protected]> Authored: Fri Sep 30 17:37:08 2016 -0700 Committer: Lisa Owen <[email protected]> Committed: Fri Sep 30 17:37:08 2016 -0700 ---------------------------------------------------------------------- .../g-loading-and-unloading-data.html.md.erb | 4 +- datamgmt/load/g-register_files.html.md.erb | 208 +++++++++++++++++++ reference/.DS_Store | Bin 6148 -> 0 bytes .../cli/admin_utilities/hawqextract.html.md.erb | 4 +- .../admin_utilities/hawqregister.html.md.erb | 177 ++++++++++------ 5 files changed, 331 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
