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

Fixing small bug that prevented OSGi panels to work in non-Karaf enviro... #512

Merged
merged 2 commits into from Sep 3, 2013
Merged

Conversation

atooni
Copy link
Contributor

@atooni atooni commented Sep 3, 2013

...nments.

@jstrachan
Copy link
Contributor

many thanks! BTW for future reference, if you do a "git rebase" instead of a "git pull" then you don't get those unnecessary "Merge remote-tracking branch 'upstream/master'" commits added. Or just hack your git config to rebase by default when you git pull...

http://d.strelau.net/post/47338904/git-pull-rebase-by-default

jstrachan added a commit that referenced this pull request Sep 3, 2013
Fixing small bug that prevented OSGi  panels to work in non-Karaf enviro...
@jstrachan jstrachan merged commit 8047406 into hawtio:master Sep 3, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants