9:34 p.m.
Branch: refs/heads/master
Home: https://github.com/hawkular/hawkular
Commit: c53f8a1ce0fa4eae12583058ccfa3581a4fd7f48
https://github.com/hawkular/hawkular/commit/c53f8a1ce0fa4eae12583058ccfa3...
Author: Mike Thompson <mithomps(a)redhat.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M console/src/main/scripts/bower.json
Log Message:
-----------
Move back to Angular 1.4.4 from Angular 1.4.8 to resolve bower conflict resolution. Our
options are 1.4.4 or 1.5.0. So 1.4.4 was chosen.
bower angular resolution Unsuitable resolution declared for
angular: 1.4.8
Unable to find a suitable version for angular, please choose one:
1) angular#1.3.20 which resolved to 1.3.20 and is required by angular-route#1.3.20,
angular-sanitize#1.3.20
2) angular#~1.3.5 which resolved to 1.3.20 and is required by hawtio-core#2.0.30
3) angular#1.4.4 which resolved to 1.4.4 and is required by angular-animate#1.4.4
4) angular#* which resolved to 1.5.0 and is required by angular-clipboard#1.3.0,
angular-md5#0.1.10, angular-momentjs#0.2.2, angular-wizard#0.6.1
5) angular#>=1.3.0 which resolved to 1.5.0 and is required by
angular-bootstrap#0.13.4, angular-toastr#1.6.0
6) angular#^1.2.16 which resolved to 1.5.0 and is required by angular-scroll#0.6.5
7) angular#^1.3.0 which resolved to 1.5.0 and is required by hawkular-charts#9bfefa9
8) angular#1.5.0 which resolved to 1.5.0 and is required by angular-resource#1.5.0
9) angular#>= 1.2.0 which resolved to 1.5.0 and is required by ng-idle#1.0.4
10) angular#>=1.2.0 which resolved to 1.5.0 and is required by
ngInfiniteScroll#1.2.1
11) angular#>=1.2.18 which resolved to 1.5.0 and is required by
angular-ui-select#0.11.2
12) angular#^1.3.5 which resolved to 1.5.0 and is required by
hawkular-ui-services#0.8.23
Commit: e1d3f4e0ff2ae87ba010266b94318a93b62b4672
https://github.com/hawkular/hawkular/commit/e1d3f4e0ff2ae87ba010266b94318...
Author: Mike Thompson <mithomps(a)redhat.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M .travis.maven.settings.xml
Log Message:
-----------
Update the .travis.maven.settings.xml license header to current year because license
check is complaining about it.
Commit: fe39a6ae80f5ca4060db2df659016c02811c09d9
https://github.com/hawkular/hawkular/commit/fe39a6ae80f5ca4060db2df659016...
Author: Mike Thompson <mithomps(a)redhat.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M
console/src/main/java/org/hawkular/console/configuration/KeycloakConfigurationServlet.java
M
console/src/main/java/org/hawkular/console/configuration/PushStateConfigurationProvider.java
M console/src/main/scripts/.editorconfig
M console/src/main/scripts/plugins/directives/subtab/less/subtab.less
M console/src/main/scripts/plugins/directives/topbar/less/topbar.less
M console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
M console/src/main/webapp/WEB-INF/jboss-web.xml
M console/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
Additional License file fixes since license check is now failing the builds because of
them. Evidently, some upstream license checker rules were changed.
Commit: 11643bdf7c3fce3b3f862ef9eb03c7a5067b0813
https://github.com/hawkular/hawkular/commit/11643bdf7c3fce3b3f862ef9eb03c...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/beans.xml
M
modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
M modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/jboss-ejb3.xml
M modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/jboss-web.xml
Log Message:
-----------
fix licenses
Commit: 52a441de9d134570d50a74102c85da35716b4a6e
https://github.com/hawkular/hawkular/commit/52a441de9d134570d50a74102c85d...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M
modules/hawkular-wildfly-agent-download/src/main/java/org/hawkular/component/wildflymonitor/WildFlyAgentServlet.java
Log Message:
-----------
missed one. how fun!
Commit: f8ad6b6b9e2b57801419e555fdd85b6e5149e81f
https://github.com/hawkular/hawkular/commit/f8ad6b6b9e2b57801419e555fdd85...
Author: Mike Thompson <mtho11(a)users.noreply.github.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M .travis.maven.settings.xml
M
console/src/main/java/org/hawkular/console/configuration/KeycloakConfigurationServlet.java
M
console/src/main/java/org/hawkular/console/configuration/PushStateConfigurationProvider.java
M console/src/main/scripts/.editorconfig
M console/src/main/scripts/bower.json
M console/src/main/scripts/plugins/directives/subtab/less/subtab.less
M console/src/main/scripts/plugins/directives/topbar/less/topbar.less
M console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
M console/src/main/webapp/WEB-INF/jboss-web.xml
M console/src/main/webapp/WEB-INF/web.xml
M
modules/hawkular-wildfly-agent-download/src/main/java/org/hawkular/component/wildflymonitor/WildFlyAgentServlet.java
M modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/beans.xml
M
modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
M modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/jboss-ejb3.xml
M modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/jboss-web.xml
Log Message:
-----------
Merge pull request #835 from hawkular/fix-bower-angular-version
Move back to Angular 1.4.4 from Angular 1.4.8 to resolve bower confli…
Compare: https://github.com/hawkular/hawkular/compare/b73ce3b8be16...f8ad6b6b9e2b