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

90b86313 · Torkel Ödegaard · 3c1e9e9a · b39aa02b · 90b86313 · 90b86313
Commit 90b86313 authored Apr 05, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 18 deletions

docs/sources/installation/debian.md
+3 -3

docs/sources/installation/rpm.md
+4 -4

docs/sources/plugins/development.md
+2 -2

packaging/publish/publish.sh
+9 -9

No files found.
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -11,7 +11,7 @@ page_keywords: grafana, installation, debian, ubuntu, guide
 Description | Download
 ------------ | -------------
 Stable .deb for Debian-based Linux | [grafana_2.6.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb)
-Beta .deb for Debian-based Linux |   [grafana_3.0.0-beta11459429091_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta11459429091_amd64.deb)
+Beta .deb for Debian-based Linux |   [grafana_3.0.0-beta21459801392_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta21459801392_amd64.deb)
 ## Install Stable
@@ -21,9 +21,9 @@ Beta .deb for Debian-based Linux |   [grafana_3.0.0-beta11459429091_amd64.deb](h
 ## Install 3.0 Beta
-    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta11459429091_amd64.deb
+    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta21459801392_amd64.deb
    $ sudo apt-get install -y adduser libfontconfig
-    $ sudo dpkg -i grafana_3.0.0-beta11459429091_amd64.deb
+    $ sudo dpkg -i grafana_3.0.0-beta21459801392_amd64.deb
 ## APT Repository

--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -11,7 +11,7 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide
 Description | Download
 ------------ | -------------
 Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.6.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm)
-Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta11459429091.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta11459429091.x86_64.rpm)
+Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta21459801392.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta21459801392.x86_64.rpm)
 ## Install Stable Release from package file
@@ -34,18 +34,18 @@ Or install manually using `rpm`.
 You can install Grafana using Yum directly.
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta11459429091.x86_64.rpm
+    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta21459801392.x86_64.rpm
 Or install manually using `rpm`.
 #### On CentOS / Fedora / Redhat:
    $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-3.0.0-beta11459429091.x86_64.rpm
+    $ sudo rpm -Uvh grafana-3.0.0-beta21459801392.x86_64.rpm
 #### On OpenSuse:
-    $ sudo rpm -i --nodeps grafana-3.0.0-beta11459429091.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-3.0.0-beta21459801392.x86_64.rpm
 ## Install via YUM Repository

--- a/docs/sources/plugins/development.md
+++ b/docs/sources/plugins/development.md
@@ -10,7 +10,7 @@ From grafana 3.0 it's very easy to develop your own plugins and share them with 
 ## Short version
-1. [Setup grafana](https://github.com/grafana/grafana/blob/master/DEVELOPMENT.md)
+1. [Setup grafana](http://docs.grafana.org/project/building_from_source/)
 2. Clone an example plugin into ```/var/lib/grafana/plugins```  or `data/plugins` (relative to grafana git repo if your running development version from source dir)
 3. Code away!
@@ -34,7 +34,7 @@ and [apps](./apps.md) plugins in the documentation.
 ## Start developing your plugin
 There are two ways that you can start developing a Grafana plugin.
-1. Setup a Grafana development environment. [(described here)](https://github.com/grafana/grafana/blob/master/DEVELOPMENT.md) and place your plugin in the ```data/plugins``` folder.
+1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
 2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](../installation/configuration.md). By default this is `/var/lib/grafana/plugins` on Linux systems.
 3. Place your plugin directory anywhere you like and specify it grafana.ini.

--- a/packaging/publish/publish.sh
+++ b/packaging/publish/publish.sh
 #! /usr/bin/env bash
-deb_ver=3.0.0-beta11459429091
+deb_ver=3.0.0-beta21459801392
-rpm_ver=3.0.0-beta11459429091
+rpm_ver=3.0.0-beta21459801392
 #rpm_ver=3.0.0-1
-wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
+#wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
-# package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb
+#package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb
-# package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
+#package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
-package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
+#package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
-package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
+#package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
-wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
+#wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
 package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
-package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
+¤package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
 # package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm
 # package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm