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 <rohit.ya...@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 <rohit.ya...@shapeblue.com>
commit 2733c3835460f063ca3f5e28edfd206fbe836e6a
Author: Daan Hoogland <d...@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 <d...@onecht.net>
commit 8421fd608563653f361671b398736fb225ed288b
Author: Daan Hoogland <d...@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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
