Author: afuchs
Date: Tue Jun 26 18:36:39 2012
New Revision: 1354155
URL: http://svn.apache.org/viewvc?rev=1354155&view=rev
Log:
branching for gradual introduction of feature set around ACCUMULO-652
Added:
accumulo/branches/ACCUMULO-652/ (props changed)
- copied from r1354153, accumulo/trunk/
Propchange: accumulo/branches/ACCUMULO-652/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 26 18:36:39 2012
@@ -0,0 +1,6 @@
+logs
+walogs
+target
+.project
+.settings
+.pydevproject
Propchange: accumulo/branches/ACCUMULO-652/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 26 18:36:39 2012
@@ -0,0 +1,14 @@
+/accumulo/branches/1.3:1309369,1328076,1330246,1330264,1330944,1349971
+/accumulo/branches/1.3/src:1309369,1328076,1330246,1349971
+/accumulo/branches/1.4:1305403-1343942,1349972,1351425
+/accumulo/branches/1.4/src:1305403-1339308,1342421-1343896,1343899-1343942,1349972,1351425
+/accumulo/trunk/src:1329425,1332224,1332278,1332347,1333047,1333070,1350779
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3/src:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3.5rc:1209938
+/incubator/accumulo/branches/1.3.5rc/src:1209938
+/incubator/accumulo/branches/1.4:1201902-1305402
+/incubator/accumulo/branches/1.4/src:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src:1304025,1305326
+/incubator/accumulo/trunk/src:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495
