From a7eeb01bc8009f3b72a43d7653b4653832341a85 Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Tue, 7 Jan 2014 17:03:11 -0800 Subject: [PATCH 1/3] fix(docs): reference correct cors flag --- Documentation/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/configuration.md b/Documentation/configuration.md index e265f522f..23b296eb8 100644 --- a/Documentation/configuration.md +++ b/Documentation/configuration.md @@ -26,7 +26,7 @@ configuration files. * `-cert-file` - The cert file of the client. * `-key-file` - The key file of the client. * `-config` - The path of the etcd config file. Defaults to `/etc/etcd/etcd.conf`. -* `-cors-origins` - A comma separated white list of origins for cross-origin resource sharing. +* `-cors` - A comma separated white list of origins for cross-origin resource sharing. * `-cpuprofile` - The path to a file to output cpu profile data. Enables cpu profiling when present. * `-data-dir` - The directory to store log and snapshot. Defaults to the current working directory. * `-max-result-buffer` - The max size of result buffer. Defaults to `1024`. From 5f2d9b38dccbca28e03b766e3fc1af42147ee97b Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Tue, 7 Jan 2014 17:03:45 -0800 Subject: [PATCH 2/3] fix(docs): reference correct cors flag --- Documentation/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/configuration.md b/Documentation/configuration.md index 23b296eb8..e78d91a15 100644 --- a/Documentation/configuration.md +++ b/Documentation/configuration.md @@ -52,7 +52,7 @@ addr = "127.0.0.1:4001" bind_addr = "127.0.0.1:4001" ca_file = "" cert_file = "" -cors_origins = [] +cors = [] cpu_profile_file = "" data_dir = "." key_file = "" From e373c9ac8ccec4f40fe5311048479a7d1951f928 Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Tue, 7 Jan 2014 17:08:15 -0800 Subject: [PATCH 3/3] fix(docs): suggest cors flag for using dashboard --- Documentation/modules.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/modules.md b/Documentation/modules.md index 441dd9b72..cd4ea6f12 100644 --- a/Documentation/modules.md +++ b/Documentation/modules.md @@ -5,7 +5,7 @@ These modules provide things like dashboards, locks and leader election. ### Dashboard -An HTML dashboard can be found at `http://127.0.0.1:4001/mod/dashboard/` +An HTML dashboard can be found at `http://127.0.0.1:4001/mod/dashboard/`. Use the `-cors='*'` flag to allow your browser to request information from the current master as it changes. ### Lock