[1/2] camel git commit: upgrade jruby 1.7.16 to 1.7.18

2014-12-31 Thread cmueller
Repository: camel Updated Branches: refs/heads/master 7bde7d010 - b1552656f upgrade jruby 1.7.16 to 1.7.18 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c02a759a Tree:

camel git commit: upgrade jruby 1.7.16 to 1.7.18

2014-12-31 Thread cmueller
Repository: camel Updated Branches: refs/heads/camel-2.14.x c1d61bc62 - fb4cb5c10 upgrade jruby 1.7.16 to 1.7.18 Conflicts: parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fb4cb5c1 Tree:

camel git commit: upgrade jruby 1.7.16 to 1.7.18

2014-12-31 Thread cmueller
Repository: camel Updated Branches: refs/heads/camel-2.13.x 945c7272c - abde55056 upgrade jruby 1.7.16 to 1.7.18 Conflicts: parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/abde5505 Tree: