[Hawkular-commits] [hawkular/hawkular] dd8883: bumping inventory version to 0.5.0.Final

Branch: refs/heads/dev/inventory-0.5.0.Final Home: https://github.com/hawkular/hawkular Commit: dd88835a43d027dd97e27bbbc2153227565041b0 https://github.com/hawkular/hawkular/commit/dd88835a43d027dd97e27bbbc2153... Author: Jirka Kremser <jkremser(a)redhat.com&gt; Date: 2015-09-29 (Tue, 29 Sep 2015) Changed paths: M modules/end-to-end-test/src/test/groovy/org/hawkular/inventory/rest/test/InventoryITest.groovy M modules/pinger/src/main/java/org/hawkular/component/pinger/PingDestination.java M pom.xml Log Message: ----------- bumping inventory version to 0.5.0.Final Commit: 76607d8423d58fa5dc3f686a922eb32b79f98c47 https://github.com/hawkular/hawkular/commit/76607d8423d58fa5dc3f686a922eb... Author: Jirka Kremser <jkremser(a)redhat.com&gt; Date: 2015-09-29 (Tue, 29 Sep 2015) Changed paths: M console/pom.xml M console/src/main/scripts/bower.json M console/src/main/scripts/plugins/accounts/html/accounts.html M console/src/main/scripts/plugins/accounts/html/inactivityModal.html A console/src/main/scripts/plugins/accounts/html/organization-new.html R console/src/main/scripts/plugins/accounts/html/organization_new.html M console/src/main/scripts/plugins/accounts/html/organizations.html M console/src/main/scripts/plugins/accounts/less/accounts.less M console/src/main/scripts/plugins/accounts/ts/accountsGlobals.ts M console/src/main/scripts/plugins/accounts/ts/accountsPlugin.ts M console/src/main/scripts/plugins/accounts/ts/organizations.ts M console/src/main/scripts/plugins/accounts/ts/persona.ts R console/src/main/scripts/plugins/directives/sidebar/html/sidebar.html R console/src/main/scripts/plugins/directives/sidebar/less/sidebar.less R console/src/main/scripts/plugins/directives/sidebar/ts/sidebarDirective.ts R console/src/main/scripts/plugins/directives/sidebar/ts/sidebarGlobals.ts R console/src/main/scripts/plugins/directives/sidebar/ts/sidebarPlugin.ts A console/src/main/scripts/plugins/directives/subtab/html/subtab.html A console/src/main/scripts/plugins/directives/subtab/less/subtab.less A console/src/main/scripts/plugins/directives/subtab/ts/subtabDirective.ts A console/src/main/scripts/plugins/directives/subtab/ts/subtabGlobals.ts A console/src/main/scripts/plugins/directives/subtab/ts/subtabPlugin.ts M console/src/main/scripts/plugins/directives/topbar/ts/topbarDirective.ts M console/src/main/scripts/plugins/directives/topbar/ts/topbarGlobals.ts M console/src/main/scripts/plugins/directives/topbar/ts/topbarPlugin.ts M console/src/main/scripts/plugins/directives/topbar/ts/topbarServices.ts R console/src/main/scripts/plugins/directives/topbar/ts/topbarTypes.ts M console/src/main/scripts/plugins/metrics/html/app-details/app-server-details.html M console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html M console/src/main/scripts/plugins/metrics/html/app-details/modals/detail-datasources-driver-add.html M console/src/main/scripts/plugins/metrics/html/app-details/modals/detail-deployments-add.html M console/src/main/scripts/plugins/metrics/html/url-alerts.html M console/src/main/scripts/plugins/metrics/html/url-availability.html M console/src/main/scripts/plugins/metrics/html/url-response-time.html M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesAlerts.ts M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesDetails.ts M console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts M console/src/main/scripts/plugins/metrics/ts/app-details/appServerWebAlerts.ts M console/src/main/scripts/plugins/metrics/ts/app-details/modals/appServerDeploymentsAddDialog.ts M console/src/main/scripts/plugins/metrics/ts/metricsAppServerDetails.ts M console/src/main/scripts/plugins/metrics/ts/metricsAppServerList.ts M console/src/main/scripts/plugins/metrics/ts/urlList.ts M console/src/main/webapp/index.html M dist/docker/Dockerfile M dist/pom.xml M dist/src/main/resources/wildfly/patches/standalone.xsl M modules/avail-creator/pom.xml M modules/end-to-end-test/pom.xml M modules/pinger/pom.xml M modules/redhat-access-integration-backend/pom.xml M pom.xml Log Message: ----------- Merge branch 'master' into dev/inventory-0.5.0.Final Conflicts: pom.xml Compare: https://github.com/hawkular/hawkular/compare/dd88835a43d0^...76607d8423d5