You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/05/07 23:37:56 UTC
svn commit: r1480096 - in /accumulo/trunk: ./ .gitignore assemble/ core/
examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
pom.xml proxy/README server/ src/
Author: ctubbsii
Date: Tue May 7 21:37:56 2013
New Revision: 1480096
URL: http://svn.apache.org/r1480096
Log:
ACCUMULO-970 ensure all 1.5 branch changes have been merged to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/.gitignore
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Modified: accumulo/trunk/.gitignore
URL: http://svn.apache.org/viewvc/accumulo/trunk/.gitignore?rev=1480096&r1=1480095&r2=1480096&view=diff
==============================================================================
--- accumulo/trunk/.gitignore (original)
+++ accumulo/trunk/.gitignore Tue May 7 21:37:56 2013
@@ -108,6 +108,12 @@
/fate/.classpath
/fate/.project
+# /proxy/
+/proxy/target
+/proxy/.settings
+/proxy/.classpath
+/proxy/.project
+
# /server/
/server/target
/server/.project
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 7 21:37:56 2013
@@ -0,0 +1,21 @@
+/accumulo/branches/1.3/proxy/README:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src/proxy/README:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4/proxy/README:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627,1468531,1468958,1480033
+/accumulo/branches/1.4/src/proxy/README:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1467288-1479121,1480033
+/accumulo/branches/1.4.2/proxy/README:1399210,1402681
+/accumulo/branches/1.4.2/src/proxy/README:1399210,1402681
+/accumulo/branches/1.5/proxy/README:1447769-1480095
+/accumulo/branches/ACCUMULO-259/proxy/README:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing/proxy/README:1449464-1451386
+/accumulo/branches/ACCUMULO-672/proxy/README:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk/proxy/README:1478775
+/accumulo/trunk/src/proxy/README:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3/proxy/README: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/proxy/README: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/proxy/README:1209938
+/incubator/accumulo/branches/1.3.5rc/src/proxy/README:1209938
+/incubator/accumulo/branches/1.4/proxy/README:1201902-1305402
+/incubator/accumulo/branches/1.4/src/proxy/README:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc/proxy/README:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src/proxy/README:1304025,1305326
+/incubator/accumulo/trunk/src/proxy/README:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095