Adding energy, area, and acceleration units #9336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* grafana/master: (257 commits) textpanel: fixes grafana#9491 csv: fix import for saveAs shim alert_tab: clear test result when testing rules plugins: expose more util and flot dependencies (cloudwatch) fix cloudwatch query error over 24h (grafana#9536) Add autofocus tag for username field on login.html (grafana#9526) show error message when cloudwatch datasource can't add CloudWatch: Add ALB RequestCountPerTarget metric set nightly version to v4.7.0-pre1 changelog: adds release date for v4.6.0-beta1 Missing dot in aws credentials path update packagecloud script for 4.6.0-beta1 changelog: adds note about closing grafana#9516 alerting: add count_non_null reducer Update rpm.md fix: can now remove annotation tags without popover closing tech: add backward compatibility for <spectrum-picker> directive (grafana#9510) fix: fixed links on new 404 page, fixes grafana#9493 logging: dont use cli logger in http_server oauth: raise error if session state is missing ...
* grafana/master: (67 commits) shore: removed unused old system conf file Use d3 from node_modules (grafana#9625) update log15 (grafana#9622) docs: update whats-new-in changelog: small text change changelog: v4.6.0-beta3 released tech: annotations refactor, add tests for regions processing (grafana#9618) Move grafana#9527 to 4.6.0-beta3 build: disable jest on precommit hook -windows fix build: fix all npm run commands for Windows plugins: fixes path issue on Windows build: tryingt of fix windows build issue tests: removes commented tests graph: invert order when sorting by legend fix: escape series name in graph legend, added aliasEscaped to time series model to reuse escape, fixes grafana#9615 build: fixed gofmt issue and addd mock response feature prometheus: enable gzip for /metrics endpoint build: split circle test shell scripts build: reduced webpack log output and remove race flag from go tests build: set max workers to 2 for jest ... Conflicts: public/app/core/utils/kbn.js
Codecov Report
@@ Coverage Diff @@
## master #9336 +/- ##
==========================================
+ Coverage 43.29% 43.32% +0.03%
==========================================
Files 243 243
Lines 21449 21461 +12
Branches 545 545
==========================================
+ Hits 9286 9298 +12
Misses 11649 11649
Partials 514 514
Continue to review full report at Codecov.
|
|
I updated this PR for kbn.ts |
|
Looks good. Thanks again @ryantxu |
ryantxu
added a commit
to NatelEnergy/grafana
that referenced
this pull request
Oct 31, 2017
* grafana/master: (24 commits) Adding energy, area, and acceleration units (grafana#9336) tests: migrated tests for link_srv to jest, grafana#9666 Transitioning fig to docker-compose v3 tests: migrated tests for link_srv to jest, grafana#9666 fix for dashboard tag link bug, fixes grafana#9737 (grafana#9739) github: dont require bug/fr in title changelog: adds note about closing grafana#9713 converted confirm_click.js to .ts (grafana#9674) Update codecov.yml Update CHANGELOG.md change default sslmode for postgres to verify-full (grafana#9736) fix: color picker bug at series overrides page, grafana#9715 (grafana#9738) Update ROADMAP.md tech: switch to golang 1.9.2 always quote template variables for mysql when multi-value is allowed (grafana#9712) always quote template variables for postgres when multi-value or include (grafana#9714) fix: dashboard links dropdown toggle did not update view, fixes grafana#9732 docs: adds prom grafana dashboard more link fixes fixed link issues ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add more units to kbn