[Hawkular-commits] [hawkular/hawkular] 5aefe7: Deleted unused files

Wed Feb 18 15:05:23 EST 2015

  Branch: refs/heads/mazz/integration-assembly
  Home:   https://github.com/hawkular/hawkular
  Commit: 5aefe7dfdd7dc9be4e6bd08966364e6bc8110d9e
      https://github.com/hawkular/hawkular/commit/5aefe7dfdd7dc9be4e6bd08966364e6bc8110d9e
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    R ui/console/d.ts/example/ts/exampleGlobals.d.ts
    R ui/console/d.ts/example/ts/examplePlugin.d.ts
    R ui/console/d.ts/example/ts/page1.d.ts
    R ui/console/d.ts/includes.d.ts

  Log Message:
  -----------
  Deleted unused files

  Commit: 1263300f784608679d2428b2b83313f34dc3b22b
      https://github.com/hawkular/hawkular/commit/1263300f784608679d2428b2b83313f34dc3b22b
  Author: Mike Thompson <mithomps at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ui/console/bower.json

  Log Message:
  -----------
  Remove bower resolutions that shouldn't be necessary.

  Commit: 6f88a6eeb7d69e8816802173dc1ada8b5919298c
      https://github.com/hawkular/hawkular/commit/6f88a6eeb7d69e8816802173dc1ada8b5919298c
  Author: Mike Thompson <mithomps at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ui/console/defs.d.ts
    M ui/console/dist/hawkular-console.js
    R ui/console/plugins/example/html/page1.html
    R ui/console/plugins/example/ts/exampleGlobals.ts
    R ui/console/plugins/example/ts/examplePlugin.ts
    R ui/console/plugins/example/ts/page1.ts

  Log Message:
  -----------
  Delete the plugin example from UI console. Any plugin code should be added to hawkular-ui-components and pulled into this console via bower package.

  Commit: c1e006e3c748f3d32797415be6f4eb6d2c2489c9
      https://github.com/hawkular/hawkular/commit/c1e006e3c748f3d32797415be6f4eb6d2c2489c9
  Author: Mike Thompson <mithomps at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ui/console/bower.json

  Log Message:
  -----------
  Fix bower version numbers for the Hawkular console to be fixed (for hawt.io libs) and let the hawkular-ui-components float with new versions of patches available to hawkular console when they are published (via bower).

  Commit: d6941b75ea50997516e3084d63b66f753b78bd5e
      https://github.com/hawkular/hawkular/commit/d6941b75ea50997516e3084d63b66f753b78bd5e
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ui/console/bower.json
    M ui/console/defs.d.ts
    M ui/console/dist/hawkular-console.js
    R ui/console/plugins/example/html/page1.html
    R ui/console/plugins/example/ts/exampleGlobals.ts
    R ui/console/plugins/example/ts/examplePlugin.ts
    R ui/console/plugins/example/ts/page1.ts

  Log Message:
  -----------
  Merge pull request #14 from hawkular/bower-fixed-packages

Bower fixed number versioning except let hawkular-ui-components float with patch changes so we will always get the latest *published* UI changes without updating the bower.json.

  Commit: f5b3aba769e3ce99eed65f967f6418649432f7cb
      https://github.com/hawkular/hawkular/commit/f5b3aba769e3ce99eed65f967f6418649432f7cb
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M README.adoc

  Log Message:
  -----------
  Update README.adoc

  Commit: 9de0de61811893ac574488da3c66bccc72b99b25
      https://github.com/hawkular/hawkular/commit/9de0de61811893ac574488da3c66bccc72b99b25
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ui/console/index.html
    A ui/console/resources/img/hawkular.png

  Log Message:
  -----------
  HAWKULAR-20: Replace header title text with image

  Commit: a3db08b1eeaacec82c3c31cbf3cac20ef3d782c3
      https://github.com/hawkular/hawkular/commit/a3db08b1eeaacec82c3c31cbf3cac20ef3d782c3
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ui/README.adoc

  Log Message:
  -----------
  Readme for console maven build update

  Commit: 7573b45038ff5af487b9d52dfbeca76369d934fa
      https://github.com/hawkular/hawkular/commit/7573b45038ff5af487b9d52dfbeca76369d934fa
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ui/console/index.html
    A ui/console/resources/img/hawkular.png

  Log Message:
  -----------
  Merge pull request #15 from ammendonca/HAWKULAR-20-II

HAWKULAR-20: Replace header title text with image

  Commit: 4c957e9ad7d13ba71d2707e7253d11fc13d24f66
      https://github.com/hawkular/hawkular/commit/4c957e9ad7d13ba71d2707e7253d11fc13d24f66
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ui/README.adoc
    R ui/console/d.ts/example/ts/exampleGlobals.d.ts
    R ui/console/d.ts/example/ts/examplePlugin.d.ts
    R ui/console/d.ts/example/ts/page1.d.ts
    R ui/console/d.ts/includes.d.ts

  Log Message:
  -----------
  Merge pull request #11 from vrockai/master

Updated ReadMe + removal of unused files

  Commit: ae86cb9e969cf00c89fc6e636e9417a07ccabd88
      https://github.com/hawkular/hawkular/commit/ae86cb9e969cf00c89fc6e636e9417a07ccabd88
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ui/console/bower.json
    M ui/console/index.html

  Log Message:
  -----------
  HAWKULAR-25: Add 'hawtio-template-cache' as bower dependency

Fixes fetching templates from $templateCache which may cause issues if they are not there yet.

  Commit: ec4d33e2fef5e9c73cfadf26ec72c20411ab8a24
      https://github.com/hawkular/hawkular/commit/ec4d33e2fef5e9c73cfadf26ec72c20411ab8a24
  Author: Alexandre Mendonça <amendonca at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add OSX .DS_Store to .gitignore

  Commit: 9281b042d15bd06bdc1687e90d9f3b48b21df1dc
      https://github.com/hawkular/hawkular/commit/9281b042d15bd06bdc1687e90d9f3b48b21df1dc
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ui/console/bower.json
    M ui/console/index.html

  Log Message:
  -----------
  Merge pull request #16 from ammendonca/HAWKULAR-25

HAWKULAR-25: Add 'hawtio-template-cache' as bower dependency

  Commit: 8f1f035dd29c5e508a0006c0495498d1b6846244
      https://github.com/hawkular/hawkular/commit/8f1f035dd29c5e508a0006c0495498d1b6846244
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge pull request #17 from ammendonca/GIT-IGNORE

Add OSX .DS_Store to .gitignore

  Commit: 89b2379abb6c25deb7f420d552385f3f51efe815
      https://github.com/hawkular/hawkular/commit/89b2379abb6c25deb7f420d552385f3f51efe815
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

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

  Log Message:
  -----------
  Upgrade to hawkular-parent version 4

  Commit: 09a9e1147dfc2a9dd085af6a695aa21d6534f241
      https://github.com/hawkular/hawkular/commit/09a9e1147dfc2a9dd085af6a695aa21d6534f241
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M pom.xml

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

  Commit: f88b65de480e3a0071611cbc5db1c2ecd38f3e48
      https://github.com/hawkular/hawkular/commit/f88b65de480e3a0071611cbc5db1c2ecd38f3e48
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M ui/console/defs.d.ts
    M ui/console/plugins/includes.ts

  Log Message:
  -----------
  HAWKULAR-23 Fix licenses in .ts and .d.ts files

  Commit: 91d9d72fe4089f384cb4684a364ff432c463d541
      https://github.com/hawkular/hawkular/commit/91d9d72fe4089f384cb4684a364ff432c463d541
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M pom.xml
    M ui/console/defs.d.ts
    M ui/console/plugins/includes.ts
    M ui/console/pom.xml

  Log Message:
  -----------
  Merge pull request #12 from ppalaga/150203-parent-4

Upgrade to hawkular-parent version 5

  Commit: f60ccd37f68685b5336b944b2cb48f1da3ce9ad4
      https://github.com/hawkular/hawkular/commit/f60ccd37f68685b5336b944b2cb48f1da3ce9ad4
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    A modules/end-to-end-test/README.adoc
    A modules/end-to-end-test/pom.xml
    A modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1.groovy
    A modules/pinger/pom.xml
    A modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/PingStatus.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/Pinger.java
    A modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java
    M pom.xml

  Log Message:
  -----------
  Describe the scenario and implement  a basic pinger.

  Commit: 7e85125a80c3020e7304cdc204cf32f6d43d211d
      https://github.com/hawkular/hawkular/commit/7e85125a80c3020e7304cdc204cf32f6d43d211d
  Author: Mike Thompson <mithomps at redhat.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ui/console/gulpfile.js
    M ui/console/index.html
    M ui/console/package.json

  Log Message:
  -----------
  Add gulp-size to build to show uncompressed and gzipped sizes of build in console without having to determine in browser.

  Commit: e4a6d99bd1a4e377c63df7a6f8b7c4615b3446e5
      https://github.com/hawkular/hawkular/commit/e4a6d99bd1a4e377c63df7a6f8b7c4615b3446e5
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    A modules/end-to-end-test/scenario1.png
    A modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy
    M modules/pinger/pom.xml
    A modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/NotificationReceiver.java
    A 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/webapp/WEB-INF/jboss-web.xml
    A modules/pinger/src/main/webapp/WEB-INF/web.xml
    M modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java

  Log Message:
  -----------
  Pinger now digests add/remove resource and reports results

  Commit: cd3cba9831664846907194055f86d3c489f47d12
      https://github.com/hawkular/hawkular/commit/cd3cba9831664846907194055f86d3c489f47d12
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M modules/end-to-end-test/README.adoc

  Log Message:
  -----------
  image file name is lower case

  Commit: 31834a5e65f94212db8069fd5992f49b32c70f13
      https://github.com/hawkular/hawkular/commit/31834a5e65f94212db8069fd5992f49b32c70f13
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M modules/pinger/pom.xml
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Pinger.java

  Log Message:
  -----------
  Publish results to the metrics topic too.

  Commit: cd46d04ca152918510dbea56273e0728d65cde3e
      https://github.com/hawkular/hawkular/commit/cd46d04ca152918510dbea56273e0728d65cde3e
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Change the format of the data put on the bus

  Commit: 718c3c47236e629710815fe85e7126b1e5930b7b
      https://github.com/hawkular/hawkular/commit/718c3c47236e629710815fe85e7126b1e5930b7b
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M README.adoc

  Log Message:
  -----------
  Add hawkular-ui-services to README.adoc

  Commit: 5830bc4227d6f3c00a435f80c6b9daf910348066
      https://github.com/hawkular/hawkular/commit/5830bc4227d6f3c00a435f80c6b9daf910348066
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/NotificationReceiver.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    M modules/pinger/src/main/java/org/hawkular/component/pinger/Pinger.java
    M modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java

  Log Message:
  -----------
  Make pinging async.

  Commit: 47c27bb59de542636dd07e26842a7fcbeb0abfa8
      https://github.com/hawkular/hawkular/commit/47c27bb59de542636dd07e26842a7fcbeb0abfa8
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade the parent pom to latest.

  Commit: e6b0ae53efb05999b5464e3c817cde75bab866a6
      https://github.com/hawkular/hawkular/commit/e6b0ae53efb05999b5464e3c817cde75bab866a6
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

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

  Log Message:
  -----------
  Fix a test-only failure

  Commit: fcfdd4c453bd4ba2b986fededb8a1d2d3fa2612c
      https://github.com/hawkular/hawkular/commit/fcfdd4c453bd4ba2b986fededb8a1d2d3fa2612c
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java

  Log Message:
  -----------
  Disable for the moment, as Travis does not have inventory running

  Commit: 1d3ee8f1eddfe0155b60a11a7b80417c538d1949
      https://github.com/hawkular/hawkular/commit/1d3ee8f1eddfe0155b60a11a7b80417c538d1949
  Author: Heiko W. Rupp <hwr at pilhuhn.de>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M modules/end-to-end-test/pom.xml

  Log Message:
  -----------
  Add a license to make the checker happy

  Commit: 7822b7940bc1b360f4d042540f2c202110f73995
      https://github.com/hawkular/hawkular/commit/7822b7940bc1b360f4d042540f2c202110f73995
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    A modules/end-to-end-test/README.adoc
    A modules/end-to-end-test/pom.xml
    A modules/end-to-end-test/scenario1.png
    A modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy
    A modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1.groovy
    A modules/pinger/pom.xml
    A modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/NotificationReceiver.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/PingDestination.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/PingStatus.java
    A modules/pinger/src/main/java/org/hawkular/component/pinger/Pinger.java
    A modules/pinger/src/main/webapp/WEB-INF/jboss-web.xml
    A modules/pinger/src/main/webapp/WEB-INF/web.xml
    A modules/pinger/src/test/java/org/hawkular/component/pinger/test/PingerTest.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #18 from pilhuhn/pinger

Add a Pinger component and describe an end2end flow

  Commit: 3165a9cdf5b72695d4249aed991ef7a61311dde7
      https://github.com/hawkular/hawkular/commit/3165a9cdf5b72695d4249aed991ef7a61311dde7
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M .travis.maven.settings.xml
    M .travis.yml

  Log Message:
  -----------
  Automatic publishing of snapshots via travis.

  Commit: 2b2ee232bcda04418dd47b64df3e4776ae364a92
      https://github.com/hawkular/hawkular/commit/2b2ee232bcda04418dd47b64df3e4776ae364a92
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Add one more test to ensure publishing does not happen for pull requests against the master branch.

  Commit: 5f91dbfe3c3ae97a8bf1451557bd786052a21dc0
      https://github.com/hawkular/hawkular/commit/5f91dbfe3c3ae97a8bf1451557bd786052a21dc0
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Skip tests on publishing since the build already passed.

  Commit: bf517a09d7c779c6c15fe0cf2e6f7caa92923764
      https://github.com/hawkular/hawkular/commit/bf517a09d7c779c6c15fe0cf2e6f7caa92923764
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    R ui/console/dist/hawkular-console.js
    M ui/console/pom.xml
    A ui/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A ui/console/src/main/webapp/WEB-INF/jboss-web.xml
    A ui/console/src/main/webapp/WEB-INF/web.xml
    A ui/console/src/main/webapp/hawkular-console.js

  Log Message:
  -----------
  generate the hawkular console war artifact so it can be consumable by other mvn modules

  Commit: 368586d4d002f7bbc728417aa43083b48590aca5
      https://github.com/hawkular/hawkular/commit/368586d4d002f7bbc728417aa43083b48590aca5
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    A ui/console/src/main/webapp/index.html

  Log Message:
  -----------
  Create index.html

  Commit: d4ab7ebce5aefc3a8594053eaf7286a6de075171
      https://github.com/hawkular/hawkular/commit/d4ab7ebce5aefc3a8594053eaf7286a6de075171
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    R ui/console/dist/hawkular-console.js
    M ui/console/pom.xml
    A ui/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A ui/console/src/main/webapp/WEB-INF/jboss-web.xml
    A ui/console/src/main/webapp/WEB-INF/web.xml
    A ui/console/src/main/webapp/hawkular-console.js
    A ui/console/src/main/webapp/index.html

  Log Message:
  -----------
  Merge pull request #19 from hawkular/mazz/ui-console-war

generate the hawkular console war artifact

  Commit: 0421f77e9a1b12c14f3a79c6b5d1fd6931700b3d
      https://github.com/hawkular/hawkular/commit/0421f77e9a1b12c14f3a79c6b5d1fd6931700b3d
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M ui/console/pom.xml
    R ui/console/src/main/webapp/hawkular-console.js
    M ui/console/src/main/webapp/index.html

  Log Message:
  -----------
  put the generated hawkular-console.js in the war. no need to have it committed into git

  Commit: 45eabc1020bc71752f0f4b307e75f56b53968eba
      https://github.com/hawkular/hawkular/commit/45eabc1020bc71752f0f4b307e75f56b53968eba
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    R ui/console/index.html
    M ui/console/src/main/webapp/index.html

  Log Message:
  -----------
  move index.html to mvn standard location of src/main/webapp

  Commit: 72721c4706d6ec01c64def59b5842195f6980305
      https://github.com/hawkular/hawkular/commit/72721c4706d6ec01c64def59b5842195f6980305
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    R ui/console/index.html
    M ui/console/pom.xml
    R ui/console/src/main/webapp/hawkular-console.js
    M ui/console/src/main/webapp/index.html

  Log Message:
  -----------
  Merge pull request #20 from hawkular/mazz/ui-console-war

more war stuff

  Commit: d553f7e56d3260a96d54cc87087775f6e2a46387
      https://github.com/hawkular/hawkular/commit/d553f7e56d3260a96d54cc87087775f6e2a46387
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M .travis.maven.settings.xml
    M .travis.yml
    R ui/console/dist/hawkular-console.js
    R ui/console/index.html
    M ui/console/pom.xml
    A ui/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A ui/console/src/main/webapp/WEB-INF/jboss-web.xml
    A ui/console/src/main/webapp/WEB-INF/web.xml
    A ui/console/src/main/webapp/index.html

  Log Message:
  -----------
  Merge branch 'master' into mazz/integration-assembly

Conflicts:
	pom.xml
	ui/console/dist/hawkular-console.js

Compare: https://github.com/hawkular/hawkular/compare/41ae9cb80716...d553f7e56d32