Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Integration latest of everything #338

Merged
merged 65 commits into from Jul 22, 2015
Merged

Conversation

jmazzitelli
Copy link
Contributor

No description provided.

ppalaga and others added 30 commits June 29, 2015 17:46
Conflicts:
	modules/end-to-end-test/pom.xml
this doesn't work yet - the ejb injection isn't working
clients can use the schema or, if they are java, can use the pojos
these are going to be the messages flowing between server and feed
…ialized without asking the commands to do it
jmazzitelli and others added 19 commits July 16, 2015 15:22
… feeds come and go

* do not use transactions in our beans, we don't need them and it screws things up if we use them
* now that we use message selectors, we can use queues instead of topics which makes things easier
HWKINVENT-90 | fixed Inventory MetricTypes test
Upgrade to hawkular-parent 18
Add .editorconfig file for multiple editors to honor spacing/tabs
HWKINVENT-69 | inventory ping integration test
jmazzitelli and others added 5 commits July 20, 2015 14:16
Fixing the gulp build (Invalid use of 'eval')
 Conflicts:
	console/src/main/scripts/plugins/metrics/ts/alertsManager.ts
	console/src/main/scripts/plugins/metrics/ts/metricsResponsePage.ts
@jkremser
Copy link
Member

as per discussion on IRC, let's continue in master

jkremser added a commit that referenced this pull request Jul 22, 2015
@jkremser jkremser merged commit f2031fc into master Jul 22, 2015
@jmazzitelli jmazzitelli deleted the integration-latest-of-everything branch July 22, 2015 17:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
7 participants