Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added W/m2(energy), l/h(flow) and kPa(pressure) #11233

Merged
merged 2 commits into from
Jun 14, 2018
Merged

Conversation

flopp999
Copy link
Contributor

@flopp999 flopp999 commented Mar 13, 2018

all as .fixedUnit

#5483

#2968 (comment)

@flopp999 flopp999 changed the title Added W/m2(energy) and l/h(flow) Added W/m2(energy), l/h(flow) and kPa(pressure) Mar 13, 2018
@codecov-io
Copy link

codecov-io commented Mar 13, 2018

Codecov Report

Merging #11233 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #11233      +/-   ##
==========================================
+ Coverage   51.75%   51.75%   +<.01%     
==========================================
  Files         352      352              
  Lines       25323    25326       +3     
  Branches     1430     1492      +62     
==========================================
+ Hits        13105    13108       +3     
  Misses      11494    11494              
  Partials      724      724

@flopp999
Copy link
Contributor Author

flopp999 commented Mar 14, 2018

check error, is this something I did wrong?
I added W/m2 and l/h first, then before the check was done I added kPa, maybe this was my mistake

@marefr
Copy link
Contributor

marefr commented Mar 14, 2018

@flopp999 no the failing test is not related to your changes. We'll look into why that tests sporadically failing.

@flopp999
Copy link
Contributor Author

Will this be added to a milestone soon?

@marefr marefr merged commit 9dd3803 into grafana:master Jun 14, 2018
@marefr marefr added this to the 5.2 milestone Jun 14, 2018
@marefr
Copy link
Contributor

marefr commented Jun 14, 2018

Thank you for contributing to Grafana!

marefr added a commit that referenced this pull request Jun 14, 2018
bergquist added a commit that referenced this pull request Jun 15, 2018
* master: (84 commits)
  docs: adds info about grafana-dev container
  changelog: add notes about closing #12282
  Added Litre/min and milliLitre/min in Flow (#12282)
  remove papaparse dependency
  list name is deleteDatasources, not delete_datasources
  remove internal influx ifql datasource
  Document the endpoint for deleting an org
  tests: rewrite into table tests
  influxdb: adds mode func to backend
  changelog: add notes about closing #11484
  changelog: add notes about closing #11233
  Remove import
  Fix PR feedback
  Removed papaparse from external plugin exports
  Karma to Jest: query_builder
  dsproxy: move http client variable back
  Karma to Jest: threshold_mapper
  Expose react and slate to external plugins
  Karma to Jest: threshold_manager
  Karma to Jest: query_def, index_pattern
  ...
@flopp999 flopp999 deleted the patch-2 branch March 20, 2020 17:27
@ying-jeanne ying-jeanne added the pr/external This PR is from external contributor label Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/external This PR is from external contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants