Merge branch 'develop'
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/3377f513 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/3377f513 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/3377f513 Branch: refs/heads/release/2.2.0.0-incubating Commit: 3377f513fc1a70314955e3cb5ddd8e090a8cdafc Parents: c3d7896 81b1ef8 Author: David Yozie <[email protected]> Authored: Fri Sep 30 17:26:03 2016 -0700 Committer: David Yozie <[email protected]> Committed: Fri Sep 30 17:26:03 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(-) ----------------------------------------------------------------------
