[Hawkular-commits] [hawkular/hawkular] 80341d: Updating the README.adoc (typos, missing component...

Jirka Kremser jkremser at redhat.com
Fri Aug 21 06:56:14 EDT 2015 

  Branch: refs/heads/dev/inventory-0.3.0.Final
  Home:   https://github.com/hawkular/hawkular
  Commit: 80341d43e20cddc2640826e0ac1ac2b3d9b546ca
      https://github.com/hawkular/hawkular/commit/80341d43e20cddc2640826e0ac1ac2b3d9b546ca
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M README.adoc

  Log Message:
  -----------
  Updating the README.adoc (typos, missing components, etc.)


  Commit: 77410f25fea0c1f9b9d6f1c42354b6b6bba7904a
      https://github.com/hawkular/hawkular/commit/77410f25fea0c1f9b9d6f1c42354b6b6bba7904a
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/app-details/alerts-setup-jvm.html
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/services/alertsManager.ts

  Log Message:
  -----------
  JVM Alerts rafactoring


  Commit: 4a884edfd2da157242e7c6a8ac0f21870863af03
      https://github.com/hawkular/hawkular/commit/4a884edfd2da157242e7c6a8ac0f21870863af03
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/app-details/alerts-setup-jvm.html
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/services/alertsManager.ts

  Log Message:
  -----------
  Alerts: NonHeap + GC setup


  Commit: 05e2bb81752b2cf246558949ddb12f15449e006d
      https://github.com/hawkular/hawkular/commit/05e2bb81752b2cf246558949ddb12f15449e006d
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/directives/alert/html/alert.html
    M console/src/main/scripts/plugins/metrics/html/app-details/detail-jvm.html
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAvailability.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsResponse.ts
    M console/src/main/scripts/plugins/metrics/ts/services/alertsManager.ts

  Log Message:
  -----------
  Alerts: JVM alerts views


  Commit: b316ee5eaf4b2cad521b9e981308b398a939c2cd
      https://github.com/hawkular/hawkular/commit/b316ee5eaf4b2cad521b9e981308b398a939c2cd
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/app-details/alerts-setup-jvm.html
    M console/src/main/scripts/plugins/metrics/less/metrics.less
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts

  Log Message:
  -----------
  Alerts JVM: visual details


  Commit: 25d5c8f0c45f63c74c43284bf0bc60e0843de039
      https://github.com/hawkular/hawkular/commit/25d5c8f0c45f63c74c43284bf0bc60e0843de039
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    A console/src/main/scripts/plugins/directives/components/html/hk-switch.html
    A console/src/main/scripts/plugins/directives/components/ts/alertDirective.ts
    M console/src/main/scripts/plugins/metrics/html/alerts-setup.html
    M console/src/main/scripts/plugins/metrics/html/app-details/alerts-setup-jvm.html
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts

  Log Message:
  -----------
  Console: Hk-Switch directive


  Commit: 6637ac68a7c3647adf0fcc486e0a2121b6a9c1e7
      https://github.com/hawkular/hawkular/commit/6637ac68a7c3647adf0fcc486e0a2121b6a9c1e7
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/directives/alert/html/fieldset-dampening.html
    M console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts
    M console/src/main/scripts/plugins/directives/components/html/hk-switch.html
    A console/src/main/scripts/plugins/directives/components/html/time-input.html
    R console/src/main/scripts/plugins/directives/components/ts/alertDirective.ts
    A console/src/main/scripts/plugins/directives/components/ts/hkComponents.ts
    R console/src/main/scripts/plugins/metrics/html/alerts-setup.html
    M console/src/main/scripts/plugins/metrics/html/availability.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-url-availability-setup.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-url-response-setup.html
    M console/src/main/scripts/plugins/metrics/html/response-time.html
    M console/src/main/scripts/plugins/metrics/less/metrics.less
    M console/src/main/scripts/plugins/metrics/ts/metricsAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAvailability.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
    M console/src/main/scripts/plugins/metrics/ts/services/alertsManager.ts

  Log Message:
  -----------
  Console: URL Alert setup redo to match current design


  Commit: 10e914c564097ad098fa71b874fcb54392c24c71
      https://github.com/hawkular/hawkular/commit/10e914c564097ad098fa71b874fcb54392c24c71
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/directives/alert/html/fieldset-dampening.html
    M console/src/main/scripts/plugins/directives/alert/html/fieldset-notification.html
    M console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts
    R console/src/main/scripts/plugins/metrics/html/app-details/alerts-setup-jvm.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-jvm-setup.html
    M console/src/main/scripts/plugins/metrics/html/modals/alerts-url-availability-setup.html
    M console/src/main/scripts/plugins/metrics/html/modals/alerts-url-response-setup.html
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAlerts.ts

  Log Message:
  -----------
  Alerts: adapting JVM alerts to use SOA directives


  Commit: ffbea217d073e439e9dd2ba6a0c89952f2c1dca1
      https://github.com/hawkular/hawkular/commit/ffbea217d073e439e9dd2ba6a0c89952f2c1dca1
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/directives/alert/html/alert.html
    M console/src/main/scripts/plugins/directives/alert/html/fieldset-dampening.html
    M console/src/main/scripts/plugins/directives/alert/html/fieldset-notification.html
    M console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts
    A console/src/main/scripts/plugins/directives/components/html/hk-switch.html
    A console/src/main/scripts/plugins/directives/components/html/time-input.html
    A console/src/main/scripts/plugins/directives/components/ts/hkComponents.ts
    R console/src/main/scripts/plugins/metrics/html/alerts-setup.html
    R console/src/main/scripts/plugins/metrics/html/app-details/alerts-setup-jvm.html
    M console/src/main/scripts/plugins/metrics/html/app-details/detail-jvm.html
    M console/src/main/scripts/plugins/metrics/html/availability.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-jvm-setup.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-url-availability-setup.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-url-response-setup.html
    M console/src/main/scripts/plugins/metrics/html/response-time.html
    M console/src/main/scripts/plugins/metrics/less/metrics.less
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAvailability.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsResponse.ts
    M console/src/main/scripts/plugins/metrics/ts/services/alertsManager.ts

  Log Message:
  -----------
  Merge pull request #401 from vrockai/AlertRedo

Console: Alerts refactoring


  Commit: 0d888332a1cbe43164e49ea0f959a10dc6d9c099
      https://github.com/hawkular/hawkular/commit/0d888332a1cbe43164e49ea0f959a10dc6d9c099
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M dist/pom.xml

  Log Message:
  -----------
  HAWKULAR-430 add-user Wildfly broken due to missing 'domain' directory


  Commit: 9ce7c9ad83e5b598415ebf172c4a692fdc7a9022
      https://github.com/hawkular/hawkular/commit/9ce7c9ad83e5b598415ebf172c4a692fdc7a9022
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/ts/urlList.ts

  Log Message:
  -----------
  HAWKULAR-553 Additional condition to skip adding invalid URL


  Commit: a29c9ec57d9f531211d92b1af48484df5ad98533
      https://github.com/hawkular/hawkular/commit/a29c9ec57d9f531211d92b1af48484df5ad98533
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/ts/urlList.ts

  Log Message:
  -----------
  Merge pull request #403 from vrockai/HAWKULAR-553

HAWKULAR-553 Additional condition to skip adding invalid URL


  Commit: a69540293c32b36c2075d19aecb1a4b3c96df791
      https://github.com/hawkular/hawkular/commit/a69540293c32b36c2075d19aecb1a4b3c96df791
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M dist/pom.xml

  Log Message:
  -----------
  Merge pull request #402 from ppalaga/master

HAWKULAR-430 add-user Wildfly broken due to missing 'domain' directory


  Commit: ec317b785941a95a900aabd7e263aafb71cf14cd
      https://github.com/hawkular/hawkular/commit/ec317b785941a95a900aabd7e263aafb71cf14cd
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    R console/src/main/scripts/plugins/directives/alert/html/alert.html
    R console/src/main/scripts/plugins/directives/alert/html/alertList.html
    R console/src/main/scripts/plugins/directives/alert/html/fieldset-dampening.html
    R console/src/main/scripts/plugins/directives/alert/html/fieldset-notification.html
    R console/src/main/scripts/plugins/directives/alert/html/timeInterval.html
    R console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts
    R console/src/main/scripts/plugins/directives/alert/ts/alertGlobals.ts
    R console/src/main/scripts/plugins/directives/alert/ts/alertPlugin.ts
    R console/src/main/scripts/plugins/directives/components/html/hk-switch.html
    R console/src/main/scripts/plugins/directives/components/html/time-input.html
    R console/src/main/scripts/plugins/directives/components/ts/hkComponents.ts
    A console/src/main/scripts/plugins/metrics/html/directives/alert-list.html
    A console/src/main/scripts/plugins/metrics/html/directives/alert.html
    A console/src/main/scripts/plugins/metrics/html/directives/fieldset-dampening.html
    A console/src/main/scripts/plugins/metrics/html/directives/fieldset-notification.html
    A console/src/main/scripts/plugins/metrics/html/directives/hk-switch.html
    A console/src/main/scripts/plugins/metrics/html/directives/time-input.html
    A console/src/main/scripts/plugins/metrics/html/directives/time-interval.html
    A console/src/main/scripts/plugins/metrics/ts/directives/alertDirective.ts
    A console/src/main/scripts/plugins/metrics/ts/directives/hkComponents.ts
    A console/src/main/scripts/plugins/metrics/ts/directives/paginationDirectives.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
    R console/src/main/scripts/plugins/metrics/ts/pagination.ts
    A console/src/main/scripts/plugins/metrics/ts/services/paginationService.ts
    M console/src/main/scripts/plugins/metrics/ts/urlList.ts

  Log Message:
  -----------
  Console: paths+codestyle refactoring


  Commit: 60e528d0dc53a74aa59b3fa7b722d39b8d2ff5dc
      https://github.com/hawkular/hawkular/commit/60e528d0dc53a74aa59b3fa7b722d39b8d2ff5dc
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    R console/src/main/scripts/plugins/directives/alert/html/alert.html
    R console/src/main/scripts/plugins/directives/alert/html/alertList.html
    R console/src/main/scripts/plugins/directives/alert/html/fieldset-dampening.html
    R console/src/main/scripts/plugins/directives/alert/html/fieldset-notification.html
    R console/src/main/scripts/plugins/directives/alert/html/timeInterval.html
    R console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts
    R console/src/main/scripts/plugins/directives/alert/ts/alertGlobals.ts
    R console/src/main/scripts/plugins/directives/alert/ts/alertPlugin.ts
    R console/src/main/scripts/plugins/directives/components/html/hk-switch.html
    R console/src/main/scripts/plugins/directives/components/html/time-input.html
    R console/src/main/scripts/plugins/directives/components/ts/hkComponents.ts
    A console/src/main/scripts/plugins/metrics/html/directives/alert-list.html
    A console/src/main/scripts/plugins/metrics/html/directives/alert.html
    A console/src/main/scripts/plugins/metrics/html/directives/fieldset-dampening.html
    A console/src/main/scripts/plugins/metrics/html/directives/fieldset-notification.html
    A console/src/main/scripts/plugins/metrics/html/directives/hk-switch.html
    A console/src/main/scripts/plugins/metrics/html/directives/time-input.html
    A console/src/main/scripts/plugins/metrics/html/directives/time-interval.html
    A console/src/main/scripts/plugins/metrics/ts/directives/alertDirective.ts
    A console/src/main/scripts/plugins/metrics/ts/directives/hkComponents.ts
    A console/src/main/scripts/plugins/metrics/ts/directives/paginationDirectives.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
    R console/src/main/scripts/plugins/metrics/ts/pagination.ts
    A console/src/main/scripts/plugins/metrics/ts/services/paginationService.ts
    M console/src/main/scripts/plugins/metrics/ts/urlList.ts

  Log Message:
  -----------
  Merge pull request #404 from vrockai/pathRefactor

Console: paths+codestyle refactoring


  Commit: 31433bf300f94a6aff7d4c81df10e0dc57c76edc
      https://github.com/hawkular/hawkular/commit/31433bf300f94a6aff7d4c81df10e0dc57c76edc
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts

  Log Message:
  -----------
  HAWKULAR-543 : Deployments "Select All" doesn't work

Fixes included:
- Toggling checkbox selects the row (and visually shows as selected);
- Clicking the row also selects it;
- Switch info bar to "N elements selected" when there's a selection;
- Select All toggles between selecting all and none;
- Enable/Disable multi operation button if there is/isn't a selection;
- Multi operation works on selected resources instead of all;


  Commit: a8d45e508840321c0267fdcacef28dd1f9f439f9
      https://github.com/hawkular/hawkular/commit/a8d45e508840321c0267fdcacef28dd1f9f439f9
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts

  Log Message:
  -----------
  Merge pull request #406 from ammendonca/HAWKULAR-543

HAWKULAR-543 : Deployments "Select All" doesn't work


  Commit: 2222f90722a57c4579ab4209c79df45244b58754
      https://github.com/hawkular/hawkular/commit/2222f90722a57c4579ab4209c79df45244b58754
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/availability.html
    M console/src/main/scripts/plugins/metrics/html/url-list.html

  Log Message:
  -----------
  HAWKULAR-336 : Add tooltips with precise date and unify format


  Commit: 6b6bf5aedc75bfc546a960cd4a6e774016c974ce
      https://github.com/hawkular/hawkular/commit/6b6bf5aedc75bfc546a960cd4a6e774016c974ce
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/availability.html
    M console/src/main/scripts/plugins/metrics/html/url-list.html

  Log Message:
  -----------
  Reduce tooltip delay from 1500 to 1000ms


  Commit: ac477d619a602cd3ac25d82821d10ea0e3b59e45
      https://github.com/hawkular/hawkular/commit/ac477d619a602cd3ac25d82821d10ea0e3b59e45
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M console/README.adoc

  Log Message:
  -----------
  Eliminate some out of date docs

And instead, point to the central Hawkular.org docs for UI.


  Commit: 3d3325143bdd347c2fe743ca90e54638997e88b8
      https://github.com/hawkular/hawkular/commit/3d3325143bdd347c2fe743ca90e54638997e88b8
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M console/README.adoc

  Log Message:
  -----------
  Merge pull request #408 from hawkular/mtho11-ui-docs-update

Eliminate some out of date UI docs


  Commit: 2d67c9e6024b9c7d4adca989b1f59c599c4de4c2
      https://github.com/hawkular/hawkular/commit/2d67c9e6024b9c7d4adca989b1f59c599c4de4c2
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/html/availability.html
    M console/src/main/scripts/plugins/metrics/html/url-list.html

  Log Message:
  -----------
  Merge pull request #407 from ammendonca/HAWKULAR-336-II

HAWKULAR-336 : Add tooltips with precise date and unify format


  Commit: 0522ad20dcd6e576c9f43acbf03f692bcc19de55
      https://github.com/hawkular/hawkular/commit/0522ad20dcd6e576c9f43acbf03f692bcc19de55
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M README.adoc

  Log Message:
  -----------
  Merge pull request #400 from Jiri-Kremser/readme-update

Updating the README.adoc (typos, missing components, etc.)


  Commit: b4522b35f42ed5177cf2122e6d3ef7f1ca06fe06
      https://github.com/hawkular/hawkular/commit/b4522b35f42ed5177cf2122e6d3ef7f1ca06fe06
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-08-21 (Fri, 21 Aug 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  inventory 0.2.1-SNAPSHOT -> 0.3.0; agent 0.3.5.Final -> 0.3.6-SNAPSHOT


  Commit: a2ae14c6271d6af919d7e100103f6e68a0a62592
      https://github.com/hawkular/hawkular/commit/a2ae14c6271d6af919d7e100103f6e68a0a62592
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-08-21 (Fri, 21 Aug 2015)

  Changed paths:
    M modules/end-to-end-test/src/test/groovy/org/hawkular/inventory/rest/test/InventoryITest.groovy

  Log Message:
  -----------
  typo


  Commit: fdd73a1e654e2be085314a72f76438cb4536e8dd
      https://github.com/hawkular/hawkular/commit/fdd73a1e654e2be085314a72f76438cb4536e8dd
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-08-21 (Fri, 21 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerWebDetails.ts

  Log Message:
  -----------
  HWKINVENT-116 the resource ID can't end with slash


  Commit: 1c015a7a34028396a632af08f3649ad16f7e29f2
      https://github.com/hawkular/hawkular/commit/1c015a7a34028396a632af08f3649ad16f7e29f2
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-08-21 (Fri, 21 Aug 2015)

  Changed paths:
    M README.adoc
    M console/README.adoc
    R console/src/main/scripts/plugins/directives/alert/html/alert.html
    R console/src/main/scripts/plugins/directives/alert/html/alertList.html
    R console/src/main/scripts/plugins/directives/alert/html/fieldset-dampening.html
    R console/src/main/scripts/plugins/directives/alert/html/fieldset-notification.html
    R console/src/main/scripts/plugins/directives/alert/html/timeInterval.html
    R console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts
    R console/src/main/scripts/plugins/directives/alert/ts/alertGlobals.ts
    R console/src/main/scripts/plugins/directives/alert/ts/alertPlugin.ts
    R console/src/main/scripts/plugins/metrics/html/alerts-setup.html
    R console/src/main/scripts/plugins/metrics/html/app-details/alerts-setup-jvm.html
    M console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
    M console/src/main/scripts/plugins/metrics/html/app-details/detail-jvm.html
    M console/src/main/scripts/plugins/metrics/html/availability.html
    A console/src/main/scripts/plugins/metrics/html/directives/alert-list.html
    A console/src/main/scripts/plugins/metrics/html/directives/alert.html
    A console/src/main/scripts/plugins/metrics/html/directives/fieldset-dampening.html
    A console/src/main/scripts/plugins/metrics/html/directives/fieldset-notification.html
    A console/src/main/scripts/plugins/metrics/html/directives/hk-switch.html
    A console/src/main/scripts/plugins/metrics/html/directives/time-input.html
    A console/src/main/scripts/plugins/metrics/html/directives/time-interval.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-jvm-setup.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-url-availability-setup.html
    A console/src/main/scripts/plugins/metrics/html/modals/alerts-url-response-setup.html
    M console/src/main/scripts/plugins/metrics/html/response-time.html
    M console/src/main/scripts/plugins/metrics/html/url-list.html
    M console/src/main/scripts/plugins/metrics/less/metrics.less
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts
    A console/src/main/scripts/plugins/metrics/ts/directives/alertDirective.ts
    A console/src/main/scripts/plugins/metrics/ts/directives/hkComponents.ts
    A console/src/main/scripts/plugins/metrics/ts/directives/paginationDirectives.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAvailability.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsResponse.ts
    R console/src/main/scripts/plugins/metrics/ts/pagination.ts
    M console/src/main/scripts/plugins/metrics/ts/services/alertsManager.ts
    A console/src/main/scripts/plugins/metrics/ts/services/paginationService.ts
    M console/src/main/scripts/plugins/metrics/ts/urlList.ts
    M dist/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into dev/inventory-0.3.0.Final

 Conflicts:
	console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
	console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts


  Commit: 8e1328b02fe341ef5c38c1720423002a1e28f9b2
      https://github.com/hawkular/hawkular/commit/8e1328b02fe341ef5c38c1720423002a1e28f9b2
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-08-21 (Fri, 21 Aug 2015)

  Changed paths:
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts

  Log Message:
  -----------
  resourceIds can't end with /, we use ~ instead


Compare: https://github.com/hawkular/hawkular/compare/a7ba2fd8e018...8e1328b02fe3

More information about the hawkular-commits mailing list