fix merge conflict
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/6e100245 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/6e100245 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/6e100245 Branch: refs/heads/develop Commit: 6e100245f8cb1554bf7c2f78101f605381699630 Parents: e8d612e Author: Lisa Owen <[email protected]> Authored: Wed Sep 28 09:35:34 2016 -0700 Committer: Lisa Owen <[email protected]> Committed: Wed Sep 28 09:35:34 2016 -0700 ---------------------------------------------------------------------- install/aws-config.html.md.erb | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/6e100245/install/aws-config.html.md.erb ---------------------------------------------------------------------- diff --git a/install/aws-config.html.md.erb b/install/aws-config.html.md.erb index 8bbb9b4..e4106b1 100644 --- a/install/aws-config.html.md.erb +++ b/install/aws-config.html.md.erb @@ -29,7 +29,6 @@ Instance store-backed storage is generally better performing than EBS and recomm **Note** EC2 *instance store* provides temporary block-level storage. This storage is located on disks that are physically attached to the host computer. While instance store provides high performance, powering off the instance causes data loss. Soft reboots preserve instance store data. Virtual devices for instance store volumes for HAWQ EC2 instance store instances are named `ephemeralN` (where *N* varies based on instance type). CentOS instance store block device are named `/dev/xvdletter` (where *letter* is a lower case letter of the alphabet). - ### <a id="topic_cfgplacegrp"></a>Configure Placement Group
