Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAMEL-8342: Add Ganglia component #393

Closed
wants to merge 2 commits into from

Conversation

dpocock
Copy link
Contributor

@dpocock dpocock commented Feb 12, 2015

This adds a Ganglia component.

@dpocock dpocock force-pushed the dpocock-ganglia branch 2 times, most recently from a8f543b to 3702008 Compare February 19, 2015 11:32
@davsclaus
Copy link
Contributor

Do you mind doing a new PR with only the latest changes.

The original PR has already been merged, and other changes. So there is a merge conflict now. And therefore cannot merge / accept the latest changes.

Conflicts:
	components/camel-ganglia/pom.xml
	components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
	components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConstants.java
	components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java
	components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
@dpocock
Copy link
Contributor Author

dpocock commented Feb 19, 2015

If just made a merge on the branch to fix it

Can you please try

git checkout master
git pull https://github.com/dpocock/camel dpocock-ganglia

and see if that gives you my merge commit? I'll try to re-open the PR in Github as well.

@dpocock dpocock closed this Feb 19, 2015
@dpocock dpocock mentioned this pull request Feb 19, 2015
osmman pushed a commit to osmman/camel that referenced this pull request Apr 1, 2022
OSFUSE-824 Align hibernate-validator version to product version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants