[Hawkular-commits] [hawkular/hawkular] 74655c: Update topbarServices.ts

Wed May 27 16:59:02 EDT 2015

  Branch: refs/heads/mazz/wip
  Home:   https://github.com/hawkular/hawkular
  Commit: 74655c2a076080cec57dd5bfe21513072fd014b0
      https://github.com/hawkular/hawkular/commit/74655c2a076080cec57dd5bfe21513072fd014b0
  Author: Jirka Kremser <jiri.kremser at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/directives/plugins/topbar/ts/topbarServices.ts

  Log Message:
  -----------
  Update topbarServices.ts

typo (watch -> $watch)

  Commit: aa36a49f9d0d9fdabbafb3b671591fc08112523f
      https://github.com/hawkular/hawkular/commit/aa36a49f9d0d9fdabbafb3b671591fc08112523f
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ui/console/pom.xml

  Log Message:
  -----------
  typo (the old version ui console was pulled from mvn repo, instead of using the freshly built one)

  Commit: a28f5dc2132c48b74a20e1f967d907efa0cccb17
      https://github.com/hawkular/hawkular/commit/a28f5dc2132c48b74a20e1f967d907efa0cccb17
  Author: Lukas Krejci <metlos at users.noreply.github.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update inventory to 0.0.6-SNAPSHOT

We are going to need at least 0.0.6 so leaving it at snapshot version for now as the rest of the deps.

  Commit: 42d07fd1227110c5b218f8cbaafd0404f3ef4460
      https://github.com/hawkular/hawkular/commit/42d07fd1227110c5b218f8cbaafd0404f3ef4460
  Author: Jirka Kremser <jiri.kremser at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #118 from hawkular/inventory-to-latest

Update inventory to 0.0.6-SNAPSHOT

  Commit: 0e63607b7502c8e8b394fc9d7cc88da5fbbd2dda
      https://github.com/hawkular/hawkular/commit/0e63607b7502c8e8b394fc9d7cc88da5fbbd2dda
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M modules/pinger/pom.xml
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
    R modules/pinger/src/main/java/org/hawkular/component/pinger/NotificationReceiver.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingDestination.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingStatus.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Pinger.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/Traits.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/TraitsPublisher.java
    A modules/pinger/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A modules/pinger/src/test/java/org/hawkular/component/pinger/PingManagerTest.java
    A modules/pinger/src/test/java/org/hawkular/component/pinger/PingerTest.java
    A modules/pinger/src/test/java/org/hawkular/component/pinger/TraitsTest.java
    R modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java
    M pom.xml

  Log Message:
  -----------
  HAWKULAR-173 Collect traits from a URL

  Commit: e4dc63958f56599d8cb8b523736ba4bc74b22aae
      https://github.com/hawkular/hawkular/commit/e4dc63958f56599d8cb8b523736ba4bc74b22aae
  Author: Lukas Krejci <lkrejci at redhat.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    A modules/pinger/src/main/webapp/WEB-INF/jboss-all.xml

  Log Message:
  -----------
  Modifications:

* pull out the testing code
* don't try to do the work of the integration code when making sure
resource types, tenants and envs exist
* make pinger always deployed after inventory.

  Commit: b26552c247a595009a24cf9617dbd45d7fb90d07
      https://github.com/hawkular/hawkular/commit/b26552c247a595009a24cf9617dbd45d7fb90d07
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M README.adoc

  Log Message:
  -----------
  Remove doc references to hawkular-ui-components

  Commit: 10bc7399bc68a51960ef00d1a3d37e9dca0f333a
      https://github.com/hawkular/hawkular/commit/10bc7399bc68a51960ef00d1a3d37e9dca0f333a
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M modules/pinger/pom.xml
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
    R modules/pinger/src/main/java/org/hawkular/component/pinger/NotificationReceiver.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingDestination.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingStatus.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Pinger.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/Traits.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/TraitsPublisher.java
    A modules/pinger/src/main/webapp/WEB-INF/jboss-all.xml
    A modules/pinger/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A modules/pinger/src/test/java/org/hawkular/component/pinger/PingManagerTest.java
    A modules/pinger/src/test/java/org/hawkular/component/pinger/PingerTest.java
    A modules/pinger/src/test/java/org/hawkular/component/pinger/TraitsTest.java
    R modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #121 from metlos/pull/113

[HAWKULAR-173][HWKINVENT-43] reworked pinger + fixes to it.

  Commit: af908c2db4ac7943c2cc351ee21e1af034c62067
      https://github.com/hawkular/hawkular/commit/af908c2db4ac7943c2cc351ee21e1af034c62067
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M README.adoc
    M dist/src/main/resources/wildfly/patches/standalone.xsl

  Log Message:
  -----------
  Make system property optional

  Commit: a2aba2badc32d12845af6507b5cd707b4b48af95
      https://github.com/hawkular/hawkular/commit/a2aba2badc32d12845af6507b5cd707b4b48af95
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M README.adoc
    M dist/src/main/resources/wildfly/patches/standalone.xsl

  Log Message:
  -----------
  Merge pull request #122 from lucasponce/OptionalSystemProperty

Make system property optional

  Commit: 1fb3ae514081b5c655c124ef89328bf06f6ce3ec
      https://github.com/hawkular/hawkular/commit/1fb3ae514081b5c655c124ef89328bf06f6ce3ec
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/directives/plugins/sidebar/html/sidebar.html
    M ui/console/src/main/scripts/plugins/directives/plugins/topbar/less/main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts-view.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-details.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/response-time.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less

  Log Message:
  -----------
  HAWKULAR-202: Namespace CSS Classes

  Commit: 3bfaa522e91c5a17573b6039b9f27b32c0eb5e99
      https://github.com/hawkular/hawkular/commit/3bfaa522e91c5a17573b6039b9f27b32c0eb5e99
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-05-23 (Sat, 23 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less

  Log Message:
  -----------
  HAWKULAR-211: URL list screen - Remove 24 hr panel and update visual styles

  Commit: 8234a22b676dee75bd8d9904ba2d3f2affab4590
      https://github.com/hawkular/hawkular/commit/8234a22b676dee75bd8d9904ba2d3f2affab4590
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-05-23 (Sat, 23 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less

  Log Message:
  -----------
  Console: Fix headings, tooltip on alert badges

  Commit: 5e2acf1891a1a3325d61c2378e2778f17b372013
      https://github.com/hawkular/hawkular/commit/5e2acf1891a1a3325d61c2378e2778f17b372013
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-05-23 (Sat, 23 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/response-time.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less

  Log Message:
  -----------
  Console: Add transitions

  Commit: 11afd2aad35a11614fdbc85ecd2650d57505fd15
      https://github.com/hawkular/hawkular/commit/11afd2aad35a11614fdbc85ecd2650d57505fd15
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-05-23 (Sat, 23 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/metricsAppServerList.ts

  Log Message:
  -----------
  HAWKULAR-146: New App List Page

  Commit: bd56cb23189211f13aeae4d1bb528424d172e065
      https://github.com/hawkular/hawkular/commit/bd56cb23189211f13aeae4d1bb528424d172e065
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-05-23 (Sat, 23 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/directives/plugins/topbar/less/main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-details.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/response-time.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less

  Log Message:
  -----------
  HAWKULAR-217: App Server Detail - JVM Metrics Tab

  Commit: 34c661113e8f8f823c46dda8df711891a7ca780c
      https://github.com/hawkular/hawkular/commit/34c661113e8f8f823c46dda8df711891a7ca780c
  Author: Lukas Krejci <lkrejci at redhat.com>
  Date:   2015-05-23 (Sat, 23 May 2015)

  Changed paths:
    M modules/pinger/pom.xml
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/TraitsPublisher.java

  Log Message:
  -----------
  Pinger fixes:

* use JNDI instead of CDI for inventory injection to prevent initialization
errors (kudos to jpkroehling for suggesting that)
* fix resource update when publishing traits

  Commit: f2ea1d6db11beca7c93f5370504b824316b247dc
      https://github.com/hawkular/hawkular/commit/f2ea1d6db11beca7c93f5370504b824316b247dc
  Author: Lukas Krejci <metlos at users.noreply.github.com>
  Date:   2015-05-23 (Sat, 23 May 2015)

  Changed paths:
    M modules/pinger/pom.xml
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/TraitsPublisher.java

  Log Message:
  -----------
  Merge pull request #124 from metlos/pinger-fixes

Pinger fixes:

  Commit: 061a8dec97d71eca5a12fb3958033f6477ea94f6
      https://github.com/hawkular/hawkular/commit/061a8dec97d71eca5a12fb3958033f6477ea94f6
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-24 (Sun, 24 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/directives/plugins/sidebar/html/sidebar.html
    M ui/console/src/main/scripts/plugins/directives/plugins/topbar/less/main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts-view.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-details.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/response-time.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/metricsAppServerList.ts

  Log Message:
  -----------
  Merge pull request #123 from ammendonca/HWK-UI-UPDATE-20150522

Integrate Console UI Updates from Gabriel

  Commit: a4368e195228579750986c727fb36b87049ad5e3
      https://github.com/hawkular/hawkular/commit/a4368e195228579750986c727fb36b87049ad5e3
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java

  Log Message:
  -----------
  HAWKULAR-173 cosmetic followup

  Commit: c0be475368ba887144b27971625ea6c15f707f2a
      https://github.com/hawkular/hawkular/commit/c0be475368ba887144b27971625ea6c15f707f2a
  Author: Viliam Rockai <vrockai at redhat.com>
  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/a13120b9c1b1da3bac7905c95a03592da50e68d8
  Author: Viliam Rockai <vrockai at redhat.com>
  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: fe8a13852ff802912e421db41251147c39b15fcf
      https://github.com/hawkular/hawkular/commit/fe8a13852ff802912e421db41251147c39b15fcf
  Author: Gabriel Cardoso <gabrielc.cardoso at gmail.com>
  Date:   2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less

  Log Message:
  -----------
  HAWKULAR-236 Feedback messages style

  Commit: 1bce4bd4455f0931ac3dba792ec132577daffb7a
      https://github.com/hawkular/hawkular/commit/1bce4bd4455f0931ac3dba792ec132577daffb7a
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  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

  Commit: c019e7185b891732781acba8d941956a5efb4525
      https://github.com/hawkular/hawkular/commit/c019e7185b891732781acba8d941956a5efb4525
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less

  Log Message:
  -----------
  Merge pull request #127 from cardosogabriel/master

HAWKULAR-236 Adjust Feedback messages style

  Commit: f5f80c05fe8d80d855b9cf1d918f76c07107de9d
      https://github.com/hawkular/hawkular/commit/f5f80c05fe8d80d855b9cf1d918f76c07107de9d
  Author: Thomas Heute <theute at gmail.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #120 from hawkular/mazz/wip

move away from snapshots for bus/nest/agent

  Commit: eec199672285b947adf21eee20965137f63e5c85
      https://github.com/hawkular/hawkular/commit/eec199672285b947adf21eee20965137f63e5c85
  Author: Thomas Heute <theute at gmail.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java

  Log Message:
  -----------
  Merge pull request #125 from ppalaga/HAWKULAR-173-followup

HAWKULAR-173 cosmetic followup

  Commit: 3fb05766dec94908f1501d752dbdbcbec5b93402
      https://github.com/hawkular/hawkular/commit/3fb05766dec94908f1501d752dbdbcbec5b93402
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M dist/assembly.xml

  Log Message:
  -----------
  Add template realm as optional

  Commit: 215df8854ac8ed3759010a59347aad7179592e91
      https://github.com/hawkular/hawkular/commit/215df8854ac8ed3759010a59347aad7179592e91
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M ui/README.adoc
    M ui/console/pom.xml

  Log Message:
  -----------
  Console: Adding generic link profile

  Commit: 6d7b7d51cf5e5cc89cc9549ca5e9cdc0f6fa9e58
      https://github.com/hawkular/hawkular/commit/6d7b7d51cf5e5cc89cc9549ca5e9cdc0f6fa9e58
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M ui/console/pom.xml

  Log Message:
  -----------
  Console: pom refactoring

  Commit: 831c30e22aa1d671de140ae1765168f641329f22
      https://github.com/hawkular/hawkular/commit/831c30e22aa1d671de140ae1765168f641329f22
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M dist/docker/README.adoc
    M dist/src/main/resources/wildfly/patches/standalone.xsl

  Log Message:
  -----------
  HAWKULAR-249 Use a relative resource for auth and the fixed one for the server->KC requests.

  Commit: d43fe806a19c19e316b58d150a2b44c56f36ab16
      https://github.com/hawkular/hawkular/commit/d43fe806a19c19e316b58d150a2b44c56f36ab16
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M ui/README.adoc
    M ui/console/pom.xml

  Log Message:
  -----------
  Merge pull request #129 from vrockai/link2

Console: Adding generic link profile

  Commit: 5c2d3a3dff1d58f104413b666dd5a9604f8e1d3e
      https://github.com/hawkular/hawkular/commit/5c2d3a3dff1d58f104413b666dd5a9604f8e1d3e
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M dist/docker/README.adoc
    M dist/src/main/resources/wildfly/patches/standalone.xsl

  Log Message:
  -----------
  Merge pull request #130 from pilhuhn/HAWKULAR-249

HAWKULAR-249 Use a relative resource for auth

  Commit: 829bfe7b7fe0261b684e11397314b42ae6d1ed10
      https://github.com/hawkular/hawkular/commit/829bfe7b7fe0261b684e11397314b42ae6d1ed10
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/gulpfile.js
    M ui/console/src/main/scripts/package.json

  Log Message:
  -----------
  HAWKULAR-250: switched to xml2js lib for xml parsing

  Commit: d9832ea78fbba4a7069859bed19121aa1f8cc305
      https://github.com/hawkular/hawkular/commit/d9832ea78fbba4a7069859bed19121aa1f8cc305
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-05-26 (Tue, 26 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 #131 from vrockai/xmljs

HAWKULAR-250: switched to xml2js lib for xml parsing

  Commit: 970a0a6ca6c41d149f1c46c6b3a20f6cff4b1343
      https://github.com/hawkular/hawkular/commit/970a0a6ca6c41d149f1c46c6b3a20f6cff4b1343
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M dist/assembly.xml

  Log Message:
  -----------
  Merge pull request #128 from lucasponce/AddOptionalTemplateUsers

Add template realm as optional

  Commit: b56e2a9a15a415f3177acd7172045ba714e6ac24
      https://github.com/hawkular/hawkular/commit/b56e2a9a15a415f3177acd7172045ba714e6ac24
  Author: Mike Thompson <mithomps at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/addUrlPage.ts

  Log Message:
  -----------
  HAWKULAR-256 Move last updated timestamp to header instead of repeated in table body.

  Commit: a0820e429b008de58eb29c065ac5b08abcacda6b
      https://github.com/hawkular/hawkular/commit/a0820e429b008de58eb29c065ac5b08abcacda6b
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/addUrlPage.ts

  Log Message:
  -----------
  Merge pull request #132 from hawkular/HAWKULAR-256

HAWKULAR-256 Move last updated timestamp to header

  Commit: 2371bea6f2cac569c5174afe9a8090dad9c66ba7
      https://github.com/hawkular/hawkular/commit/2371bea6f2cac569c5174afe9a8090dad9c66ba7
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade to hawkular-parent 14

  Commit: 1f501f2aab1eda1555354a54be235429336614de
      https://github.com/hawkular/hawkular/commit/1f501f2aab1eda1555354a54be235429336614de
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M modules/end-to-end-test/pom.xml
    M modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy
    R modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1.groovy
    A modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1ITest.groovy
    M pom.xml

  Log Message:
  -----------
  HAWKULAR-238 Fix hawkular-end-to-end-tests

  Commit: 346e1b6ff3c02175b9e43021df8c515ffb3668bd
      https://github.com/hawkular/hawkular/commit/346e1b6ff3c02175b9e43021df8c515ffb3668bd
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-05-27 (Wed, 27 May 2015)

  Changed paths:
    M modules/end-to-end-test/pom.xml
    M modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy
    R modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1.groovy
    A modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1ITest.groovy
    M pom.xml

  Log Message:
  -----------
  Merge pull request #133 from ppalaga/HAWKULAR-238

HAWKULAR-238 Fix hawkular-end-to-end-tests

  Commit: e98706b727930c90af79de2f06bc9e4e703e8b9e
      https://github.com/hawkular/hawkular/commit/e98706b727930c90af79de2f06bc9e4e703e8b9e
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-05-27 (Wed, 27 May 2015)

  Changed paths:
    M README.adoc
    M dist/assembly.xml
    M dist/docker/README.adoc
    M dist/src/main/resources/wildfly/patches/standalone.xsl
    M modules/end-to-end-test/pom.xml
    M modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy
    R modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1.groovy
    A modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1ITest.groovy
    M modules/pinger/pom.xml
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
    R modules/pinger/src/main/java/org/hawkular/component/pinger/NotificationReceiver.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingDestination.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingStatus.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Pinger.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/Traits.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/TraitsPublisher.java
    A modules/pinger/src/main/webapp/WEB-INF/jboss-all.xml
    A modules/pinger/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A modules/pinger/src/test/java/org/hawkular/component/pinger/PingManagerTest.java
    A modules/pinger/src/test/java/org/hawkular/component/pinger/PingerTest.java
    A modules/pinger/src/test/java/org/hawkular/component/pinger/TraitsTest.java
    R modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java
    M pom.xml
    M ui/README.adoc
    M ui/console/pom.xml
    M ui/console/src/main/scripts/gulpfile.js
    M ui/console/src/main/scripts/package.json
    M ui/console/src/main/scripts/plugins/directives/plugins/sidebar/html/sidebar.html
    M ui/console/src/main/scripts/plugins/directives/plugins/topbar/less/main.less
    M ui/console/src/main/scripts/plugins/directives/plugins/topbar/ts/topbarServices.ts
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts-view.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-details.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/response-time.html
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/addUrlPage.ts
    M ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/metricsAppServerList.ts

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into mazz/wip

Conflicts:
	pom.xml

Compare: https://github.com/hawkular/hawkular/compare/632125db5374...e98706b72793