Branch: refs/heads/master Home: https://github.com/hawkular/hawkular Commit: c0be475368ba887144b27971625ea6c15f707f2a https://github.com/hawkular/hawkular/commit/c0be475368ba887144b27971625ea... Author: Viliam Rockai <vrockai(a)redhat.com&gt; Date: 2015-05-25 (Mon, 25 May 2015) Changed paths: M ui/console/src/main/scripts/gulpfile.js M ui/console/src/main/scripts/package.json Log Message: ----------- UI: Auto-discovery of the kettle dir in gulp script Conflicts: ui/console/src/main/scripts/gulpfile.js Commit: a13120b9c1b1da3bac7905c95a03592da50e68d8 https://github.com/hawkular/hawkular/commit/a13120b9c1b1da3bac7905c95a035... Author: Viliam Rockai <vrockai(a)redhat.com&gt; Date: 2015-05-25 (Mon, 25 May 2015) Changed paths: M ui/console/src/main/scripts/gulpfile.js Log Message: ----------- Console: Make watch-server copy dist files immediately on start Commit: 1bce4bd4455f0931ac3dba792ec132577daffb7a https://github.com/hawkular/hawkular/commit/1bce4bd4455f0931ac3dba792ec13... Author: Mike Thompson <mtho11(a)users.noreply.github.com&gt; Date: 2015-05-25 (Mon, 25 May 2015) Changed paths: M ui/console/src/main/scripts/gulpfile.js M ui/console/src/main/scripts/package.json Log Message: ----------- Merge pull request #126 from vrockai/gulp_watch Console gulp script enhancements Compare: https://github.com/hawkular/hawkular/compare/061a8dec97d7...1bce4bd4455f