Author: dkulp
Date: Fri Jul  8 19:42:18 2011
New Revision: 1144453

URL: http://svn.apache.org/viewvc?rev=1144453&view=rev
Log:
Merged revisions 1093999 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1093999 | davsclaus | 2011-04-16 09:54:09 -0400 (Sat, 16 Apr 2011) | 1 line
  
  CAMEL-3872: Added test based on user forum issue.
........

Added:
    
camel/branches/camel-2.7.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
      - copied unchanged from r1093999, 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
    
camel/branches/camel-2.7.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/
      - copied from r1093999, 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/
    
camel/branches/camel-2.7.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/Car.java
      - copied unchanged from r1093999, 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/Car.java
Modified:
    camel/branches/camel-2.7.x/   (props changed)

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul  8 19:42:18 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.


Reply via email to