[01/49] hbase-site git commit: Published site at 3810ba2c6edfc531181ffc9e6c68396a0c2d2027.

2018-09-12 Thread git-site-role
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 8ea88a7b6 -> 705d69c41


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/705d69c4/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.RegionData.html
--
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.RegionData.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.RegionData.html
index 110e99c..d115ecb 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.RegionData.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.RegionData.html
@@ -515,7 +515,7 @@
 507this.htd = htd;
 508this.desc = desc;
 509this.tableRegions = 
tableRegions;
-510this.snapshotDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir);
+510this.snapshotDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir, conf);
 511new FSTableDescriptors(conf)
 512  
.createTableDescriptorForTableDirectory(snapshotDir, htd, false);
 513  }
@@ -695,7 +695,7 @@
 687.setVersion(version)
 688.build();
 689
-690  Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir);
+690  Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir, conf);
 691  
SnapshotDescriptionUtils.writeSnapshotInfo(desc, workingDir, fs);
 692  return new SnapshotBuilder(conf, 
fs, rootDir, htd, desc, regions);
 693}

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/705d69c4/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.SnapshotBuilder.html
--
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.SnapshotBuilder.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.SnapshotBuilder.html
index 110e99c..d115ecb 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.SnapshotBuilder.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.SnapshotBuilder.html
@@ -515,7 +515,7 @@
 507this.htd = htd;
 508this.desc = desc;
 509this.tableRegions = 
tableRegions;
-510this.snapshotDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir);
+510this.snapshotDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir, conf);
 511new FSTableDescriptors(conf)
 512  
.createTableDescriptorForTableDirectory(snapshotDir, htd, false);
 513  }
@@ -695,7 +695,7 @@
 687.setVersion(version)
 688.build();
 689
-690  Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir);
+690  Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir, conf);
 691  
SnapshotDescriptionUtils.writeSnapshotInfo(desc, workingDir, fs);
 692  return new SnapshotBuilder(conf, 
fs, rootDir, htd, desc, regions);
 693}

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/705d69c4/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.html
--
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.html
index 110e99c..d115ecb 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.SnapshotMock.html
@@ -515,7 +515,7 @@
 507this.htd = htd;
 508this.desc = desc;
 509this.tableRegions = 
tableRegions;
-510this.snapshotDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir);
+510this.snapshotDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir, conf);
 511new FSTableDescriptors(conf)
 512  
.createTableDescriptorForTableDirectory(snapshotDir, htd, false);
 513  }
@@ -695,7 +695,7 @@
 687.setVersion(version)
 688.build();
 689
-690  Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir);
+690  Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(desc, rootDir, conf);
 691  
SnapshotDescriptionUtils.writeSnapshotInfo(desc, workingDir, fs);
 692  return new SnapshotBuilder(conf, 
fs, rootDir, htd, desc, regions);
 693}


[01/49] hbase-site git commit: Published site at .

2017-09-24 Thread git-site-role
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site d4d7b028a -> e6bd07743


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.html
--
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.html
index 6d71e47..f5d13fc 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.html
@@ -65,1007 +65,1003 @@
 057import 
org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessorEnvironment;
 058import 
org.apache.hadoop.hbase.filter.BinaryComparator;
 059import 
org.apache.hadoop.hbase.master.MasterCoprocessorHost;
-060import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;
-061import 
org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;
-062import 
org.apache.hadoop.hbase.regionserver.Region;
-063import 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;
-064import 
org.apache.hadoop.hbase.regionserver.RegionScanner;
-065import 
org.apache.hadoop.hbase.regionserver.RegionServerCoprocessorHost;
-066import 
org.apache.hadoop.hbase.wal.WALEdit;
-067import 
org.apache.hadoop.hbase.security.User;
-068import 
org.apache.hadoop.hbase.security.access.Permission.Action;
-069import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;
-070import 
org.apache.hadoop.hbase.testclassification.LargeTests;
-071import 
org.apache.hadoop.hbase.testclassification.SecurityTests;
-072import 
org.apache.hadoop.hbase.util.Bytes;
-073import 
org.apache.hadoop.hbase.util.Pair;
-074import 
org.apache.hadoop.hbase.TestTableName;
-075import org.apache.log4j.Level;
-076import org.apache.log4j.Logger;
-077import org.junit.After;
-078import org.junit.AfterClass;
-079import org.junit.Before;
-080import org.junit.BeforeClass;
-081import org.junit.Rule;
-082import org.junit.Test;
-083import 
org.junit.experimental.categories.Category;
-084
-085import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
-086
-087@Category({SecurityTests.class, 
LargeTests.class})
-088public class 
TestWithDisabledAuthorization extends SecureTestUtil {
-089  private static final Log LOG = 
LogFactory.getLog(TestWithDisabledAuthorization.class);
-090
-091  static {
-092
Logger.getLogger(AccessController.class).setLevel(Level.TRACE);
-093
Logger.getLogger(AccessControlFilter.class).setLevel(Level.TRACE);
-094
Logger.getLogger(TableAuthManager.class).setLevel(Level.TRACE);
-095  }
-096
-097  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
-098
-099  private static final byte[] TEST_FAMILY 
= Bytes.toBytes("f1");
-100  private static final byte[] 
TEST_FAMILY2 = Bytes.toBytes("f2");
-101  private static final byte[] TEST_ROW = 
Bytes.toBytes("testrow");
-102  private static final byte[] TEST_Q1 = 
Bytes.toBytes("q1");
-103  private static final byte[] TEST_Q2 = 
Bytes.toBytes("q2");
-104  private static final byte[] TEST_Q3 = 
Bytes.toBytes("q3");
-105  private static final byte[] TEST_Q4 = 
Bytes.toBytes("q4");
-106  private static final byte[] ZERO = 
Bytes.toBytes(0L);
-107
-108  private static 
MasterCoprocessorEnvironment CP_ENV;
-109  private static AccessController 
ACCESS_CONTROLLER;
-110  private static 
RegionServerCoprocessorEnvironment RSCP_ENV;
-111  private RegionCoprocessorEnvironment 
RCP_ENV;
-112
-113  @Rule public TestTableName TEST_TABLE = 
new TestTableName();
-114
-115  // default users
-116  
-117  // superuser
-118  private static User SUPERUSER;
-119  // user granted with all global 
permission
-120  private static User USER_ADMIN;
-121  // user with rw permissions on column 
family.
-122  private static User USER_RW;
-123  // user with read-only permissions
-124  private static User USER_RO;
-125  // user is table owner. will have all 
permissions on table
-126  private static User USER_OWNER;
-127  // user with create table permissions 
alone
-128  private static User USER_CREATE;
-129  // user with no permissions
-130  private static User USER_NONE;
-131  // user with only partial read-write 
perms (on family:q1 only)
-132  private static User USER_QUAL;
-133
-134  @BeforeClass
-135  public static void setupBeforeClass() 
throws Exception {
-136Configuration conf = 
TEST_UTIL.getConfiguration();
-137// Up the handlers; this test needs 
more than usual.
-138
TEST_UTIL.getConfiguration().setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT,
 10);
-139// Enable security
-140enableSecurity(conf);
-141// We expect 0.98 cell ACL 
semantics
-142

[01/49] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.

2017-07-14 Thread git-site-role
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 196fd50e3 -> b17bf22bd


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b17bf22b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
--
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
index 19f2eb3..b2f12ad 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
@@ -25,156 +25,150 @@
 017 */
 018package 
org.apache.hadoop.hbase.regionserver;
 019
-020import static 
org.junit.Assert.assertTrue;
-021
-022import java.io.IOException;
-023import java.net.InetAddress;
-024import java.net.NetworkInterface;
-025import java.util.Enumeration;
-026import java.util.List;
-027import java.util.Locale;
-028
-029import org.apache.commons.logging.Log;
-030import 
org.apache.commons.logging.LogFactory;
-031import 
org.apache.hadoop.conf.Configuration;
-032import 
org.apache.hadoop.hbase.HBaseConfiguration;
-033import 
org.apache.hadoop.hbase.HBaseTestingUtility;
-034import 
org.apache.hadoop.hbase.testclassification.MediumTests;
-035import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;
-036import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;
-037import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
-038import org.junit.Test;
-039import 
org.junit.experimental.categories.Category;
-040
-041/**
-042 * Tests for the hostname specification 
by region server
-043 */
-044@Category({RegionServerTests.class, 
MediumTests.class})
-045public class TestRegionServerHostname {
-046  private static final Log LOG = 
LogFactory.getLog(TestRegionServerHostname.class);
-047
-048  @Test (timeout=3)
-049  public void 
testInvalidRegionServerHostnameAbortsServer() throws Exception {
-050final int NUM_MASTERS = 1;
-051final int NUM_RS = 1;
-052String invalidHostname = 
"hostAddr.invalid";
-053Configuration conf = 
HBaseConfiguration.create();
-054HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility(conf);
-055
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, 
invalidHostname);
-056try {
-057  
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);
-058} catch (IOException ioe) {
-059  Throwable t1 = ioe.getCause();
-060  Throwable t2 = t1.getCause();
-061  assertTrue(t1.getMessage() + " - " 
+ t2.getMessage(),
-062t2.getMessage().contains("Failed 
resolve of " + invalidHostname) ||
-063t2.getMessage().contains("Problem 
binding to " + invalidHostname));
-064  return;
-065} finally {
-066  TEST_UTIL.shutdownMiniCluster();
-067}
-068assertTrue("Failed to validate 
against invalid hostname", false);
-069  }
-070
-071  @Test(timeout=12)
-072  public void testRegionServerHostname() 
throws Exception {
-073final int NUM_MASTERS = 1;
-074final int NUM_RS = 1;
-075EnumerationNetworkInterface 
netInterfaceList = NetworkInterface.getNetworkInterfaces();
-076Configuration conf = 
HBaseConfiguration.create();
-077HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility(conf);
-078while 
(netInterfaceList.hasMoreElements()) {
-079  NetworkInterface ni = 
netInterfaceList.nextElement();
-080  EnumerationInetAddress 
addrList = ni.getInetAddresses();
-081  // iterate through host addresses 
and use each as hostname
-082  while (addrList.hasMoreElements()) 
{
-083InetAddress addr = 
addrList.nextElement();
-084if (addr.isLoopbackAddress() || 
addr.isLinkLocalAddress() || addr.isMulticastAddress()) {
-085  continue;
-086}
-087String hostName = 
addr.getHostName();
-088LOG.info("Found " + hostName + " 
on " + ni);
-089
-090
TEST_UTIL.getConfiguration().set(HRegionServer.MASTER_HOSTNAME_KEY, 
hostName);
-091
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, hostName);
-092
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);
-093try {
-094  ZooKeeperWatcher zkw = 
TEST_UTIL.getZooKeeperWatcher();
-095  ListString servers = 
ZKUtil.listChildrenNoWatch(zkw, zkw.znodePaths.rsZNode);
-096  // there would be NUM_RS+1 
children - one for the master
-097  assertTrue(servers.size() == 
NUM_RS+1);
-098  for (String server : servers) 
{
-099assertTrue("From zookeeper: " 
+ server + " hostname: " + hostName,
-100  
server.startsWith(hostName.toLowerCase(Locale.ROOT)+","));
-101  }
-102  zkw.close();
-103} finally {
-104  
TEST_UTIL.shutdownMiniCluster();
-105}
-106  }
-107}
-108  }
-109
-110  @Test(timeout=3)
-111  public void 

[01/49] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.

2017-06-16 Thread git-site-role
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 946f218bf -> cd7ae54c5


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/cd7ae54c/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsNoOptimizeStoreScanner.html
--
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsNoOptimizeStoreScanner.html
 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsNoOptimizeStoreScanner.html
index bd482fe..13dc8e9 100644
--- 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsNoOptimizeStoreScanner.html
+++ 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsNoOptimizeStoreScanner.html
@@ -233,7 +233,7 @@ extends 
org.apache.hadoop.hbase.regionserver.StoreScanner
 
 
 Methods inherited from 
classorg.apache.hadoop.hbase.regionserver.StoreScanner
-checkFlushed, checkScanOrder, close, enableLazySeekGlobally, 
getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getReadPoint, 
getScannerOrder, next, next, next, peek, reopenAfterFlush, reseek, resetKVHeap, 
seek, seekAsDirection, seekScanners, seekToNextRow, selectScannersFrom, 
shipped, trySkipToNextRow, updateReaders
+checkFlushed, checkScanOrder, close, enableLazySeekGlobally, 
getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getReadPoint, 
getScannerOrder, isScanUsePread, next, next, next, peek, reopenAfterFlush, 
reseek, resetKVHeap, seek, seekAsDirection, seekScanners, seekToNextRow, 
selectScannersFrom, shipped, trySkipToNextRow, updateReaders
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/cd7ae54c/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsStoreScanner.html
--
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsStoreScanner.html
 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsStoreScanner.html
index 9b58463..69478e6 100644
--- 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsStoreScanner.html
+++ 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.CellWithVersionsStoreScanner.html
@@ -233,7 +233,7 @@ extends 
org.apache.hadoop.hbase.regionserver.StoreScanner
 
 
 Methods inherited from 
classorg.apache.hadoop.hbase.regionserver.StoreScanner
-checkFlushed, checkScanOrder, close, enableLazySeekGlobally, 
getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getReadPoint, 
getScannerOrder, next, next, next, peek, reopenAfterFlush, reseek, resetKVHeap, 
seek, seekAsDirection, seekScanners, seekToNextRow, selectScannersFrom, 
shipped, trySkipToNextRow, updateReaders
+checkFlushed, checkScanOrder, close, enableLazySeekGlobally, 
getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getReadPoint, 
getScannerOrder, isScanUsePread, next, next, next, peek, reopenAfterFlush, 
reseek, resetKVHeap, seek, seekAsDirection, seekScanners, seekToNextRow, 
selectScannersFrom, shipped, trySkipToNextRow, updateReaders
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/cd7ae54c/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
--
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
index 156521d..18beacb 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -372,38 +372,42 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 void
-testScannerReseekDoesntNPE()
+testPreadNotEnabledForCompactionStoreScanners()
 
 
 void
-testScanSameTimestamp()
+testScannerReseekDoesntNPE()
 
 
 void
-testScanTimeRange()
+testScanSameTimestamp()
 
 
 void
-testSkipColumn()
+testScanTimeRange()
 
 
 void
-testWildCardOneVersionScan()
+testSkipColumn()
 
 
 void
-testWildCardScannerUnderDeletes()
+testWildCardOneVersionScan()
 
 
 void

[01/49] hbase-site git commit: Published site at 4b3e38705cb24aee82615b1b9af47ed549ea1358.

2016-03-03 Thread misty
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site c115ab439 -> 4ce8323fc


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4ce8323f/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
--
diff --git a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html 
b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index 366f78f..4cc2c04 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -69,14 +69,14 @@
 59requiredArguments = {
 60  
@org.jamon.annotations.Argument(name = "master", type = "HMaster")},
 61optionalArguments = {
-62  
@org.jamon.annotations.Argument(name = "filter", type = "String"),
+62  
@org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),
 63  
@org.jamon.annotations.Argument(name = "format", type = "String"),
-64  
@org.jamon.annotations.Argument(name = "servers", type = "ListServerName"),
-65  
@org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),
-66  
@org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),
-67  
@org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),
-68  
@org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),
-69  
@org.jamon.annotations.Argument(name = "deadServers", type = "SetServerName"),
+64  
@org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),
+65  
@org.jamon.annotations.Argument(name = "servers", type = "ListServerName"),
+66  
@org.jamon.annotations.Argument(name = "deadServers", type = "SetServerName"),
+67  
@org.jamon.annotations.Argument(name = "filter", type = "String"),
+68  
@org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),
+69  
@org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),
 70  
@org.jamon.annotations.Argument(name = "frags", 
type = "MapString,Integer")})
 71  public class 
MasterStatusTmpl
 72extends org.jamon.AbstractTemplateProxy
@@ -118,23 +118,23 @@
 108   return m_master;
 109 }
 110 private HMaster
 m_master;
-111 // 26, 1
-112 public void 
setFilter(String filter)
+111 // 25, 1
+112 public void 
setCatalogJanitorEnabled(boolean 
catalogJanitorEnabled)
 113 {
-114   // 26, 1
-115   m_filter = 
filter;
-116   
m_filter__IsNotDefault = true;
+114   // 25, 1
+115   
m_catalogJanitorEnabled = catalogJanitorEnabled;
+116   
m_catalogJanitorEnabled__IsNotDefault = true;
 117 }
-118 public String getFilter()
+118 public boolean getCatalogJanitorEnabled()
 119 {
-120   return m_filter;
+120   return m_catalogJanitorEnabled;
 121 }
-122 private String m_filter;
-123 public boolean getFilter__IsNotDefault()
+122 private boolean m_catalogJanitorEnabled;
+123 public boolean getCatalogJanitorEnabled__IsNotDefault()
 124 {
-125   return m_filter__IsNotDefault;
+125   return m_catalogJanitorEnabled__IsNotDefault;
 126 }
-127 private boolean m_filter__IsNotDefault;
+127 private boolean m_catalogJanitorEnabled__IsNotDefault;
 128 // 27, 1
 129 public void 
setFormat(String format)
 130 {
@@ -152,108 +152,108 @@
 142   return m_format__IsNotDefault;
 143 }
 144 private boolean m_format__IsNotDefault;
-145 // 23, 1
-146 public void 
setServers(ListServerName servers)
+145 // 22, 1
+146 public void 
setMetaLocation(ServerName 
metaLocation)
 147 {
-148   // 23, 1
-149   m_servers = 
servers;
-150   
m_servers__IsNotDefault = true;
+148   // 22, 1
+149   m_metaLocation 
= metaLocation;
+150   
m_metaLocation__IsNotDefault = true;
 151 }
-152 public ListServerName getServers()
+152 public ServerName 
getMetaLocation()
 153 {
-154   return m_servers;
+154   return m_metaLocation;
 155 }
-156 private ListServerName m_servers;
-157 public boolean getServers__IsNotDefault()
+156 private ServerName 
m_metaLocation;
+157 public boolean getMetaLocation__IsNotDefault()
 158 {
-159   return m_servers__IsNotDefault;
+159   return m_metaLocation__IsNotDefault;
 160 }
-161 private boolean m_servers__IsNotDefault;
-162 // 29, 1
-163 public void 
setAssignmentManager(AssignmentManager
 assignmentManager)
+161 private boolean m_metaLocation__IsNotDefault;
+162 // 23, 1
+163 public void 
setServers(ListServerName servers)
 164 {
-165   // 29, 1
-166   
m_assignmentManager = assignmentManager;
-167   
m_assignmentManager__IsNotDefault = true;
+165   // 23, 1
+166   m_servers = 
servers;
+167   
m_servers__IsNotDefault = true;
 168 }
-169 public