You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by DaanHoogland <gi...@git.apache.org> on 2015/11/28 18:09:22 UTC
[GitHub] cloudstack pull request: 4.6 to master
GitHub user DaanHoogland opened a pull request:
https://github.com/apache/cloudstack/pull/1136
4.6 to master
two conflicts:
ui/scripts/system.js
ui/scripts/instances.js
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/DaanHoogland/cloudstack 4.6-to-master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1136.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1136
----
commit 13f1319453fdbf525f3a88d46f958e4411afb25d
Author: Rohit Yadav <ro...@shapeblue.com>
Date: 2015-11-23T06:10:46Z
CLOUDSTACK-9020: UI enhancements from metrics view
- Sortable columns
- Logos with cloudmonkey
- Wider UI
- CSS fixes and new status icons
- Configurable UI list api requests page size
- IP address column on instances page
- Listview widget enhancements
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
commit 2733c3835460f063ca3f5e28edfd206fbe836e6a
Author: Daan Hoogland <da...@onecht.net>
Date: 2015-11-28T16:47:30Z
Merge pull request #1106 from shapeblue/4.6-uifixesmetrics
[4.6] CLOUDSTACK-9020: UI enhancements from metrics view- Sortable columns
- Logos with cloudmonkey
- Wider UI
- CSS fixes and new status icons
- Configurable UI list api requests page size
- IP address column on instances page
- Listview widget enhancements
cc @remibergsma @karuturi
* pr/1106:
CLOUDSTACK-9020: UI enhancements from metrics view
Signed-off-by: Daan Hoogland <da...@onecht.net>
commit 8421fd608563653f361671b398736fb225ed288b
Author: Daan Hoogland <da...@onecht.net>
Date: 2015-11-28T17:04:05Z
Merge release branch 4.6 to master
* 4.6:
CLOUDSTACK-9020: UI enhancements from metrics view
----
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by remibergsma <gi...@git.apache.org>.
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 speaking, the forward merging approach is the better one as it allows for tracking back the commit ids to all branches a commit is in.
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by DaanHoogland <gi...@git.apache.org>.
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. Now the same thing is doen in two different commits. the idea is that you always merge forward so you can always track the branches a change is in. Squashing??? we don't go back to the mess we were in are we?
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by DaanHoogland <gi...@git.apache.org>.
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by remibergsma <gi...@git.apache.org>.
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 now also is none.
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by bhaisaab <gi...@git.apache.org>.
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 conflict resolution which did not solve the regression fixed in 4.6.
Fwd-merging is fine, but the way we're merging Github PRs it's difficult to track changes even using --no-merges with git log. IMO the git log history is practically unreadable or followable, along with the fact that we don't squash merge changes for each github PR.
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by bhaisaab <gi...@git.apache.org>.
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` confirms that changes now.
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by remibergsma <gi...@git.apache.org>.
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 something else there. Never mind, it's fine this way and the end result is also great: 4.6 had an improved UI and 4.7 has that + metrics. Thanks!
I think we should discuss the squashing on the list. I'm fine, as long as we decide something and then live it. Let's not do it here ;-)
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by DaanHoogland <gi...@git.apache.org>.
Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1136#issuecomment-160321329
@bhaisaab please make sure I made the right merge decisions. @karuturi @remibergsma second LGTM?
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: 4.6 to master
Posted by remibergsma <gi...@git.apache.org>.
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
- The bug mentioned in #1119 is resolved, as the fix was merged to 4.6 and now lands in master.
The instance tab now shows "No data to show" instead of an endless loading loop.
Thanks @DaanHoogland for resolving the merge conflict.
---
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 feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---