Files · 106fe4854f818bc53b27c1c06ef01913a355edcc · Kornkitt Poolsup / nexpie-grafana-theme

Merge branch 'prometheus' of github.com:grafana/grafana · 106fe485

Conflicts:
	pkg/models/datasource.go
	public/app/plugins/datasource/prometheus/datasource.js
	public/app/plugins/datasource/prometheus/partials/query.editor.html
	public/app/plugins/datasource/prometheus/queryCtrl.js

committed Oct 06, 2015

106fe485

Name	Last commit	Last Update
.hooks		Loading commit data...
Godeps		Loading commit data...
benchmarks/ab		Loading commit data...
conf		Loading commit data...
docker		Loading commit data...
docs		Loading commit data...
emails		Loading commit data...
packaging		Loading commit data...
pkg		Loading commit data...
public		Loading commit data...
tasks		Loading commit data...
tests/config-files		Loading commit data...
typings		Loading commit data...
vendor/phantomjs		Loading commit data...
.bowerrc		Loading commit data...
.bra.toml		Loading commit data...
.editorconfig		Loading commit data...
.gitignore		Loading commit data...
.jscs.json		Loading commit data...
.jsfmtrc		Loading commit data...
.jshintrc		Loading commit data...
CHANGELOG.md		Loading commit data...
CONTRIBUTING.md		Loading commit data...
Gruntfile.js		Loading commit data...
LICENSE.md		Loading commit data...
NOTICE.md		Loading commit data...
README.md		Loading commit data...
appveyor.yml		Loading commit data...
bower.json		Loading commit data...
build.go		Loading commit data...
circle.yml		Loading commit data...
karma.conf.js		Loading commit data...
latest.json		Loading commit data...
main.go		Loading commit data...
package.json		Loading commit data...
test.sh		Loading commit data...
tsconfig.json		Loading commit data...
tsd.json		Loading commit data...

README.md