Watch

Reviewing merge request #424: re-introduce power series in RRD

stored power values are only used for 1-second series, all other power series are deducted from the energy values as they are more accurate

Requested by: Christian Hitz
Status: Closed
Source repository: chhitzs-dss-mainline:bug1368-power-values
Target repository: dss-mainline:release-1.3
Created at: February 1st, 2012 09:53

Commits that would be merged:

Version 4

Version 1
Version 2
Version 3
Version 4

1b51ce3
1168d7f

Revert "do not store power values"

f214d92

use power series only for seconds intervall

0d91543

better RRD detection

Showing

Showing 1b51ce3-1168d7f

Comments
Include comments entered inline

Pushed new version 1

Christian Hitz | 2012-02-01 09:53:05 UTC

Pushed new version 2

Christian Hitz | 2012-02-01 09:53:05 UTC

Pushed new version 3

Christian Hitz | 2012-02-02 12:11:08 UTC

Pushed new version 4

Christian Hitz | 2012-02-02 13:52:28 UTC

→ State changed from Open to Closed

merged

Michael Tross | 2012-02-02 20:53:00 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/424

# Fetch the merge request into this branch
git pull \
  git://gitorious.digitalstrom.org/dss/dss-mainline.git \
  refs/merge-requests/424

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit release-1.3..merge-requests/424

# To apply the changes to your branch:
git checkout release-1.3
git merge merge-requests/424
git push origin release-1.3