Merge remote-tracking branch 'origin/master'
diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md
new file mode 100644
index 0000000..ff85d10
--- /dev/null
+++ b/CONTRIBUTION.md
@@ -0,0 +1,23 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution;
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index cf044ce..b397cbe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,26 +1,4 @@
- ====
- Copyright 2016 Apigee Corporation
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
-
-====
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -201,7 +179,7 @@
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
+ boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
@@ -209,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2016 Apigee Corp
+ Copyright 2018 Google LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..eaa0f1e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+<!-- BEGIN Google Required Disclaimer -->
+
+# Not Google Product Clause
+
+This is not an officially supported Google product.
+<!-- END Google Required Disclaimer -->
\ No newline at end of file
diff --git a/sample-ec2/edge-dc1 b/sample-ec2/edge-dc1
new file mode 100644
index 0000000..949dbe6
--- /dev/null
+++ b/sample-ec2/edge-dc1
@@ -0,0 +1,74 @@
+[tag_Name_dc_1_ds]
+[tag_Name_dc_1_ms]
+[tag_Name_dc_1_rmp]
+[tag_Name_dc_1_qpid]
+[tag_Name_dc_1_pgmaster]
+[tag_Name_dc_1_pgstandby]
+
+[dc-1-edge:children]
+tag_Name_dc_1_ds
+tag_Name_dc_1_ms
+tag_Name_dc_1_rmp
+tag_Name_dc_1_qpid
+tag_Name_dc_1_pgmaster
+tag_Name_dc_1_pgstandby
+
+[dc-1-ds:children]
+tag_Name_dc_1_ds
+
+# Setting an observer Zookeeper node
+# tag_Name_dc_1_zk_observer zk_observer=true
+
+# Setting Cassandra with Rack Aware Settings
+# cf-001 rack=1,1
+# cf-002 rack=1,2
+# cf-003 rack=1,3
+
+[dc-1-ms:children]
+tag_Name_dc_1_ms
+
+[dc-1-rmp:children]
+tag_Name_dc_1_rmp
+
+[dc-1-qpid:children]
+tag_Name_dc_1_qpid
+
+[dc-1-pgmaster:children]
+tag_Name_dc_1_pgmaster
+
+[dc-1-pgstandby:children]
+tag_Name_dc_1_pgstandby
+
+[planet:children]
+dc-1
+
+[dc-1:children]
+dc-1-edge
+
+[edge:children]
+dc-1-edge
+
+[ms:children]
+dc-1-ms
+
+[ds:children]
+dc-1-ds
+
+[rmp:children]
+dc-1-rmp
+
+[qpid:children]
+dc-1-qpid
+
+[pg:children]
+dc-1-pg
+
+[dc-1-pg:children]
+dc-1-pgmaster
+dc-1-pgstandby
+
+[pgmaster:children]
+dc-1-pgmaster
+
+[pgstandby:children]
+dc-1-pgstandby
