Merge branch 'master' of github.com:grafana/grafana

docs/sources/guides/whats-new-in-v4-1.md

@@ -1,17 +1,17 @@
 +++
-title = "What's New in Grafana v4.1 beta"
-description = "Feature & improvement highlights for Grafana v4.1 beta"
-keywords = ["grafana", "new", "documentation", "4.1.0-beta1"]
+title = "What's New in Grafana v4.1"
+description = "Feature & improvement highlights for Grafana v4.1"
+keywords = ["grafana", "new", "documentation", "4.1.0"]
 type = "docs"
 [menu.docs]
-name = "Version 4.1 beta"
+name = "Version 4.1"
 identifier = "v4.1"
 parent = "whatsnew"
 weight = -1
 +++
 
 
-## Whats new in Grafana v4.1 beta
+## Whats new in Grafana v4.1
 - **Graph**: Support for shared tooltip on all graphs as you hover over one graph. [#1578](https://github.com/grafana/grafana/pull/1578), [#6274](https://github.com/grafana/grafana/pull/6274)
 - **Victorops**: Add VictorOps notification integration [#6411](https://github.com/grafana/grafana/issues/6411), thx [@ichekrygin](https://github.com/ichekrygin)
 - **Opsgenie**: Add OpsGenie notification integratiion [#6687](https://github.com/grafana/grafana/issues/6687), thx [@kylemcc](https://github.com/kylemcc)
@@ -55,7 +55,7 @@ Once the `access key` and `secret key` have been saved the user will no longer b
 
 ## Upgrade & Breaking changes
 
-Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Grafana 4.1.0-beta1 contains no breaking changes.
+Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Grafana 4.1.0 contains no breaking changes.
 
 ## Changelog
 

docs/sources/installation/debian.md

@@ -15,14 +15,14 @@ weight = 1
 
 Description | Download
 ------------ | -------------
-Stable for Debian-based Linux | [4.1.0 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484056345_amd64.deb)
+Stable for Debian-based Linux | [4.1.0 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484127817_amd64.deb)
 
 ## Install Stable
 
 ```
-$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484056345_amd64.deb
+$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484127817_amd64.deb
 $ sudo apt-get install -y adduser libfontconfig
-$ sudo dpkg -i grafana_4.1.0-1484056345_amd64.deb
+$ sudo dpkg -i grafana_4.1.0-1484127817_amd64.deb
 ```
 
 ## APT Repository

docs/sources/installation/rpm.md

@@ -15,24 +15,24 @@ weight = 2
 
 Description | Download
 ------------ | -------------
-Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.0 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484056345.x86_64.rpm)
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.0 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484127817.x86_64.rpm)
 
 ## Install Stable
 
 You can install Grafana using Yum directly.
 
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484056345.x86_64.rpm
+    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484127817.x86_64.rpm
 
 Or install manually using `rpm`.
 
 #### On CentOS / Fedora / Redhat:
 
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-4.1.0-1484056345.x86_64.rpm
+    $ sudo rpm -Uvh grafana-4.1.0-1484127817.x86_64.rpm
 
 #### On OpenSuse:
 
-    $ sudo rpm -i --nodeps grafana-4.1.0-1484056345.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-4.1.0-1484127817.x86_64.rpm
 
 ## Install via YUM Repository
 

packaging/publish/publish_both.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
-deb_ver=4.1.0-1484056345
-rpm_ver=4.1.0-1484056345
+deb_ver=4.1.0-1484127817
+rpm_ver=4.1.0-1484127817
 
 wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb