Skip to content

2.x#2

Merged
craigpnnl merged 146 commits into
masterfrom
2.x
Mar 7, 2015
Merged

2.x#2
craigpnnl merged 146 commits into
masterfrom
2.x

Conversation

@craigpnnl
Copy link
Copy Markdown
Contributor

Merge from the 2.x branch into the master branch

…e new version of karaf comes out on the 27th.
…n't relevant to the current clientServiceFactory implementation.
craigpnnl added 28 commits March 6, 2015 09:11
Updated readme that is in the master branch so that this one can be used instead.
craigpnnl added a commit that referenced this pull request Mar 7, 2015
@craigpnnl craigpnnl merged commit 59a3eb5 into master Mar 7, 2015
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.

3 participants