Author: ctubbsii
Date: Fri Jun 7 17:41:20 2013
New Revision: 1490749
URL: http://svn.apache.org/r1490749
Log:
ACCUMULO-1498 ensure 1.3.6 tag merges cleanly into 1.4 branch by updating svn
metadata
Modified:
accumulo/branches/1.4/ (props changed)
accumulo/branches/1.4/docs/src/user_manual/ (props changed)
accumulo/branches/1.4/src/ (props changed)
accumulo/branches/1.4/src/core/ (props changed)
accumulo/branches/1.4/src/server/ (props changed)
accumulo/branches/1.4/src/server/src/ (props changed)
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/
(props changed)
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
(props changed)
Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.3.6:r1346049-1356351
Merged
/incubator/accumulo/branches/1.3:r1178656-1190279,1190281-1190412,1190414-1190419,1190421-1190426,1190428-1190499,1190501-1195621,1195623-1195624,1195626-1195628,1195630-1195634,1195636-1196043,1196045-1196053,1196055-1196056,1196058-1196070,1196073-1196105,1196107-1197065,1197067-1198934,1198936-1199382,1199384-1203682,1203684-1204624,1204626-1205546,1205548-1205879,1205881-1206168,1206170-1208030,1208032-1209123,1209125-1209525,1209527-1209531,1209533-1209538,1209540,1209542-1209586,1209588-1209656,1209658-1210517,1210519-1210570,1210572-1210595,1210597,1210599-1213423,1213425-1214319,1214321-1225005,1225007-1227214,1227216-1227230,1227232-1227610,1227612-1228194,1228196-1230179,1230181-1230735,1230737-1231042,1231044-1236872,1236874-1245631,1245633-1305402
Merged
/accumulo/branches/1.3:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1330263,1330265-1346048
Merged /accumulo/tags/1.3.6:r1359344-1490747
Merged /accumulo/tags/1.3.6rc1:r1356352-1359343
Propchange: accumulo/branches/1.4/docs/src/user_manual/
------------------------------------------------------------------------------
Merged /accumulo/tags/1.3.6/docs/src/user_manual:r1359344-1490747
Merged /accumulo/tags/1.3.6rc1/docs/src/user_manual:r1356352-1359343
Merged
/accumulo/branches/1.3/docs/src/user_manual:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1330263,1330265-1346048
Merged
/incubator/accumulo/branches/1.3/docs/src/user_manual:r1178656-1190279,1190281-1190412,1190414-1190419,1190421-1190426,1190428-1190499,1190501-1195621,1195623-1195624,1195626-1195628,1195630-1195634,1195636-1196043,1196045-1196053,1196055-1196056,1196058-1196070,1196073-1196105,1196107-1197065,1197067-1198934,1198936-1199382,1199384-1203682,1203684-1204624,1204626-1205546,1205548-1205879,1205881-1206168,1206170-1208030,1208032-1209123,1209125-1209525,1209527-1209531,1209533-1209538,1209540,1209542-1209586,1209588-1209656,1209658-1210517,1210519-1210570,1210572-1210595,1210597,1210599-1213423,1213425-1214319,1214321-1225005,1225007-1227214,1227216-1227230,1227232-1227610,1227612-1228194,1228196-1230179,1230181-1230735,1230737-1231042,1231044-1236872,1236874-1245631,1245633-1305402
Merged /accumulo/branches/1.3.6/docs/src/user_manual:r1346049-1356351
Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
Merged
/incubator/accumulo/branches/1.3/src:r1178656-1190279,1190281-1190412,1190414-1190419,1190421-1190426,1190428-1190499,1190501-1195621,1195623-1195624,1195626-1195628,1195630-1195634,1195636-1196043,1196045-1196053,1196055-1196056,1196058-1196070,1196073-1196105,1196107-1197065,1197067-1198934,1198936-1199382,1199384-1203682,1203684-1204624,1204626-1205546,1205548-1205879,1205881-1206168,1206170-1208030,1208032-1209123,1209125-1209525,1209527-1209531,1209533-1209538,1209540,1209542-1209586,1209588-1209656,1209658-1210517,1210519-1210570,1210572-1210595,1210597,1210599-1213423,1213425-1214319,1214321-1225005,1225007-1227214,1227216-1227230,1227232-1227610,1227612-1228194,1228196-1230179,1230181-1230735,1230737-1231042,1231044-1236872,1236874-1245631,1245633-1305402
Merged /accumulo/tags/1.3.6rc1/src:r1356352-1359343
Merged /accumulo/tags/1.3.6/src:r1359344-1490747
Merged
/accumulo/branches/1.3/src:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1346048
Merged /accumulo/branches/1.3.6/src:r1346049-1356351
Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
Merged /accumulo/tags/1.3.6rc1/src/core:r1356352-1359343
Merged /accumulo/tags/1.3.6/src/core:r1359344-1490747
Merged
/accumulo/branches/1.3/src/core:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1330263,1330265-1346048
Merged /incubator/accumulo/branches/1.3/src/core:r1178656-1305402
Merged /accumulo/branches/1.3.6/src/core:r1346049-1356351
Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
Merged /incubator/accumulo/branches/1.3/src/server:r1178656-1305402
Merged /accumulo/branches/1.3.6/src/server:r1346049-1356351
Merged
/accumulo/branches/1.3/src/server:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1330263,1330265-1346048
Merged /accumulo/tags/1.3.6rc1/src/server:r1356352-1359343
Merged /accumulo/tags/1.3.6/src/server:r1359344-1490747
Propchange: accumulo/branches/1.4/src/server/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.3.6/src/server/src:r1346049-1356351
Merged /accumulo/tags/1.3.6/src/server/src:r1359344-1490747
Merged
/accumulo/branches/1.3/src/server/src:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1330263,1330265-1346048
Merged /incubator/accumulo/branches/1.3/src/server/src:r1178656-1305402
Merged /accumulo/tags/1.3.6rc1/src/server/src:r1356352-1359343
Propchange:
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/
------------------------------------------------------------------------------
Merged
/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1178656-1305402
Merged
/accumulo/branches/1.3.6/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1346049-1356351
Merged
/accumulo/tags/1.3.6/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1359344-1490747
Merged
/accumulo/tags/1.3.6rc1/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1356352-1359343
Merged
/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1330263,1330265-1346048
Propchange:
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1305403-1309368,1309370-1328075,1328077-1330245,1330247-1330263,1330265-1346048
