Merge branch 'master' of https://github.com/ge0ffrey/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68354800 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68354800 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68354800 Branch: refs/heads/master Commit: 683548000c26ca4d0fccba62a16b508a9e12168e Parents: 1001336 2f3f239 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Aug 5 16:15:23 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Aug 5 16:15:23 2014 +0200 ---------------------------------------------------------------------- .../camel/component/optaplanner/OptaPlannerComponent.java | 3 +-- .../camel/component/optaplanner/OptaPlannerEndpoint.java | 5 ++--- ...ptaPlannerComponentConfigurationAndDocumentationTest.java | 2 +- .../apache/camel/component/optaplanner/OptaPlannerTest.java | 3 ++- .../org/apache/camel/component/optaplanner/solverConfig.xml | 8 ++++---- parent/pom.xml | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/68354800/parent/pom.xml ----------------------------------------------------------------------
