Github user DaanHoogland closed the pull request at:
https://github.com/apache/cloudstack/pull/1136
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feat
Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160418520
@bhaisaab you should not have merged #1119 as it is also in 4.6. This merge
commit was wrong because of this isse and should have been fixed before
merging. No
Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160391149
@bhaisaab The commit ID didn't change from the PR and your merge, that was
fine. It was just different in 4.6 branch because the change was done combined
with s
Github user bhaisaab commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160391011
@remibergsma I used the git pr tool so not sure how the commit ID changed,
I merged the other PR because 4.6 merge on master chose the other change while
merge con
Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160390613
@bhaisaab The problem with your approach, to be honest, is that the commit
ID changed. As this was a bit of a special case it may not be a problem.
General spea
Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160390043
@bhaisaab The change in PR #1119 is the same as in this PR, except for an
extra comma?
Anyway, we should now close this PR @DaanHoogland as the result n
Github user bhaisaab commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160336829
@remibergsma @DaanHoogland the merge conflict resolution did not include
the fix for master, I've merged #1119 to address that. `git diff master..4.6
ui/scripts` c
Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160332479
LGTM, since the change is in the UI I built that from this branch.
Two checks:
- The metrics feature still works properly
