You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/09/13 12:13:24 UTC
svn commit: r1384264 - in /camel/branches/camel-2.9.x: ./
components/camel-apns/src/main/resources/
components/camel-apns/src/main/resources/META-INF/
components/camel-jsch/src/main/resources/META-INF/
components/camel-stax/src/main/resources/META-INF/...
Author: ningjiang
Date: Thu Sep 13 10:13:23 2012
New Revision: 1384264
URL: http://svn.apache.org/viewvc?rev=1384264&view=rev
Log:
Merged revisions 1384240 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1384240 | ningjiang | 2012-09-13 16:54:45 +0800 (Thu, 13 Sep 2012) | 9 lines
Merged revisions 1384226 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1384226 | ningjiang | 2012-09-13 16:10:06 +0800 (Thu, 13 Sep 2012) | 1 line
CAMEL-5602 Fixed the license file issue of camel artifacts
........
................
Added:
camel/branches/camel-2.9.x/components/camel-apns/src/main/resources/META-INF/LICENSE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-apns/src/main/resources/META-INF/LICENSE.txt
camel/branches/camel-2.9.x/components/camel-apns/src/main/resources/META-INF/NOTICE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-apns/src/main/resources/META-INF/NOTICE.txt
camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/LICENSE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-jsch/src/main/resources/META-INF/LICENSE.txt
camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/NOTICE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-jsch/src/main/resources/META-INF/NOTICE.txt
camel/branches/camel-2.9.x/components/camel-stax/src/main/resources/META-INF/LICENSE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-stax/src/main/resources/META-INF/LICENSE.txt
camel/branches/camel-2.9.x/components/camel-stax/src/main/resources/META-INF/NOTICE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-stax/src/main/resources/META-INF/NOTICE.txt
camel/branches/camel-2.9.x/components/camel-zookeeper/src/main/resources/META-INF/LICENSE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/resources/META-INF/LICENSE.txt
camel/branches/camel-2.9.x/components/camel-zookeeper/src/main/resources/META-INF/NOTICE.txt
- copied unchanged from r1384240, camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/resources/META-INF/NOTICE.txt
Removed:
camel/branches/camel-2.9.x/components/camel-apns/src/main/resources/LICENSE.txt
camel/branches/camel-2.9.x/components/camel-apns/src/main/resources/NOTICE.txt
Modified:
camel/branches/camel-2.9.x/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1384226
Merged /camel/branches/camel-2.10.x:r1384240
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.