[Hawkular-commits] [hawkular/hawkular] 2900df: Review HAWKULAR-67 implementation

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular Commit: 2900df8a8bdc3f5c1f358007280767aca2c5ef13 https://github.com/hawkular/hawkular/commit/2900df8a8bdc3f5c1f35800728076... Author: Gabriel Cardoso <gabrielc.cardoso(a)gmail.com&gt; Date: 2015-10-01 (Thu, 01 Oct 2015) Changed paths: M console/src/main/scripts/plugins/accounts/html/organization-new.html M console/src/main/scripts/plugins/accounts/html/organizations.html M console/src/main/scripts/plugins/metrics/less/metrics.less M console/src/main/webapp/index.html Log Message: ----------- Review HAWKULAR-67 implementation Commit: df3f74c00caaeb8f16752098d0f0e92d153d9127 https://github.com/hawkular/hawkular/commit/df3f74c00caaeb8f16752098d0f0e... Author: Gabriel Cardoso <gabrielc.cardoso(a)gmail.com&gt; Date: 2015-10-02 (Fri, 02 Oct 2015) Changed paths: M console/src/main/scripts/plugins/metrics/less/metrics.less Log Message: ----------- Reverting less to previous version Commit: 5b7c4eec62501ba5ae3a306940592bd9984a56cb https://github.com/hawkular/hawkular/commit/5b7c4eec62501ba5ae3a306940592... Author: Gabriel Cardoso <gabrielc.cardoso(a)gmail.com&gt; Date: 2015-10-02 (Fri, 02 Oct 2015) Changed paths: M console/src/main/scripts/plugins/accounts/html/organizations.html M console/src/main/scripts/plugins/accounts/less/accounts.less M console/src/main/scripts/plugins/metrics/less/metrics.less Log Message: ----------- HAWKULAR-67 CSS changes need for organizations Commit: 9c304c89887a338d3abcd0a3950bf204aad26306 https://github.com/hawkular/hawkular/commit/9c304c89887a338d3abcd0a3950bf... Author: Mike Thompson <mithomps(a)redhat.com&gt; Date: 2015-10-03 (Sat, 03 Oct 2015) Changed paths: M console/src/main/scripts/plugins/accounts/html/organization-new.html M console/src/main/scripts/plugins/accounts/html/organizations.html M console/src/main/scripts/plugins/accounts/less/accounts.less M console/src/main/scripts/plugins/metrics/less/metrics.less M console/src/main/webapp/index.html Log Message: ----------- Resolve Merge conflicts for organization-new.html Commit: bcb9782e03d81d76d05514742c1dfb61d668e8ae https://github.com/hawkular/hawkular/commit/bcb9782e03d81d76d05514742c1df... Author: Mike Thompson <mithomps(a)redhat.com&gt; Date: 2015-10-03 (Sat, 03 Oct 2015) Changed paths: M console/src/main/scripts/plugins/accounts/html/organization-new.html M console/src/main/scripts/plugins/accounts/html/organizations.html M console/src/main/scripts/plugins/accounts/less/accounts.less M console/src/main/scripts/plugins/metrics/less/metrics.less M console/src/main/webapp/index.html Log Message: ----------- masterMerge branch 'cardosogabriel-master' Compare: https://github.com/hawkular/hawkular/compare/d4b44c3da12e...bcb9782e03d8