diff --git a/CHANGELOG.md b/CHANGELOG.md index b9e66fcfba..802dc6777e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.4.1 (Unreleased) +## 0.4.1 (October 20, 2014) FEATURES: @@ -23,6 +23,7 @@ BUG FIXES: * Serf snapshot compaction works on Windows [GH-332] * Raft snapshots work on Windows [GH-265] * Consul service entry clean by clients now possible + * Fixing improper deserialization IMPROVEMENTS: @@ -203,11 +204,11 @@ FEATURES: * /v1/health/service/ endpoint can take an optional `?passing` flag to filter to only nodes with passing results. [GH-57] * The KV endpoint suports listing keys with the `?keys` query parameter, - and limited up to a seperator using `?seperator=`. + and limited up to a separator using `?separator=`. IMPROVEMENTS: - * Health check output goes into seperate `Output` field instead + * Health check output goes into separate `Output` field instead of overriding `Notes`. [GH-59] * Adding a minimum check interval to prevent checks with extremely low intervals fork bombing. [GH-64] @@ -226,7 +227,7 @@ BUG FIXES: * DNS parser can handler period in a tag name. [GH-39] * "application/json" content-type is sent on HTTP requests. [GH-45] * Work around for LMDB delete issue. [GH-85] - * Fixed tag gossip propogation for rapid restart. [GH-86] + * Fixed tag gossip propagation for rapid restart. [GH-86] MISC: diff --git a/Makefile b/Makefile index ddf0c548af..4146605dce 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,10 @@ test: deps integ: go list ./... | INTEG_TESTS=yes xargs -n1 go test +cover: deps + ./scripts/verify_no_uuid.sh + go list ./... | xargs -n1 go test --cover + format: deps @echo "--> Running go fmt" @go fmt $(PACKAGES) diff --git a/Vagrantfile b/Vagrantfile index 2cb6c7f0d5..101ce30d8c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,9 +2,9 @@ # vi: set ft=ruby : # Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" +VAGRANTFILE_API_VERSION = '2' -$script = < + <%= javascript_include_tag 'application' %> + + + diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index 9b346c4d54..c364b42555 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -1,71 +1,56 @@ + - - - - + + - + <%= current_page.data.page_title ? "#{current_page.data.page_title} - " : "" %>Consul + -<%= current_page.data.page_title ? "#{current_page.data.page_title} - " : "" %>Consul + <%= stylesheet_link_tag "application" %> - -<%= stylesheet_link_tag "application" %> + + + - - + + - - - + - - + + -<%= yield_content :head %> + <%= yield_content :head %> + - - -"> - + + + + diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 52d171e4dd..d6764e7929 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -79,6 +79,10 @@ keygen + > + keyring + + > leave diff --git a/website/source/layouts/downloads.erb b/website/source/layouts/downloads.erb index d8abc56613..fae7586349 100644 --- a/website/source/layouts/downloads.erb +++ b/website/source/layouts/downloads.erb @@ -6,8 +6,8 @@ Download Consul - > - Download Web UI + > + Download Consul Tools diff --git a/website/source/robots.txt b/website/source/robots.txt new file mode 100644 index 0000000000..190c6ce045 --- /dev/null +++ b/website/source/robots.txt @@ -0,0 +1,8 @@ +--- +layout: false +noindex: true +--- + +User-agent: * +Disallow: /404 +Disallow: /500 diff --git a/website/source/sitemap.xml.builder b/website/source/sitemap.xml.builder new file mode 100644 index 0000000000..a08b5b0e34 --- /dev/null +++ b/website/source/sitemap.xml.builder @@ -0,0 +1,19 @@ +--- +layout: false +--- + +xml.instruct! +xml.urlset 'xmlns' => "http://www.sitemaps.org/schemas/sitemap/0.9" do + sitemap + .resources + .select { |page| page.path =~ /\.html/ } + .select { |page| !page.data.noindex } + .each do |page| + xml.url do + xml.loc File.join(base_url, page.url) + xml.lastmod Date.today.to_time.iso8601 + xml.changefreq page.data.changefreq || "monthly" + xml.priority page.data.priority || "0.5" + end + end +end