diff --git a/editor/build/build.py b/editor/build/build.py
index 016ca71b..1aded890 100755
--- a/editor/build/build.py
+++ b/editor/build/build.py
@@ -224,7 +224,7 @@ def _RunAnt(build_dir, antfile, revision, name, buildroot,
'/usr/bin/ant',
#currently the copy of ant in third_party will not build the
#code properly so we are going to use the version of Ant that
- #is installed on the build slave.
+ #is installed on the build subordinate.
#TODO(mrrussell): figure out why third_party Ant does not work and
# have the build use that version of ant
# os.path.join(antpath, 'bin', 'ant'), '-lib', bzip2libpath,
diff --git a/editor/build/gsTool.py b/editor/build/gsTool.py
index 590689b1..026ea749 100644
--- a/editor/build/gsTool.py
+++ b/editor/build/gsTool.py
@@ -32,7 +32,7 @@ def _BuildOptions():
If you do not specify the location of GSUtil with --gsutilloc the
program will look in:
- /b/build/scripts/slave/gsutil (BuildBot location)
+ /b/build/scripts/subordinate/gsutil (BuildBot location)
~/gsutil/gsutil (local disk)
search your path for gsutil
diff --git a/editor/build/gsutil.py b/editor/build/gsutil.py
index a09b085f..6f61ca90 100644
--- a/editor/build/gsutil.py
+++ b/editor/build/gsutil.py
@@ -44,7 +44,7 @@ def _FindGsUtil(self, gsutil_loc):
Raises:
Exception: gsutil is not found
"""
- bot_gs_util = '/b/build/scripts/slave/gsutil'
+ bot_gs_util = '/b/build/scripts/subordinate/gsutil'
if gsutil_loc is None:
home_gs_util = os.path.join(os.path.expanduser('~'), 'gsutil', 'gsutil')
else:
diff --git a/third_party/gsutil/20110627/boto/boto/emr/connection.py b/third_party/gsutil/20110627/boto/boto/emr/connection.py
index 70ddf824..c743a2cc 100644
--- a/third_party/gsutil/20110627/boto/boto/emr/connection.py
+++ b/third_party/gsutil/20110627/boto/boto/emr/connection.py
@@ -146,8 +146,8 @@ def add_jobflow_steps(self, jobflow_id, steps):
'AddJobFlowSteps', params, RunJobFlowResponse, verb='POST')
def run_jobflow(self, name, log_uri, ec2_keyname=None, availability_zone=None,
- master_instance_type='m1.small',
- slave_instance_type='m1.small', num_instances=1,
+ main_instance_type='m1.small',
+ subordinate_instance_type='m1.small', num_instances=1,
action_on_failure='TERMINATE_JOB_FLOW', keep_alive=False,
enable_debugging=False,
hadoop_version='0.18',
@@ -164,10 +164,10 @@ def run_jobflow(self, name, log_uri, ec2_keyname=None, availability_zone=None,
:param ec2_keyname: EC2 key used for the instances
:type availability_zone: str
:param availability_zone: EC2 availability zone of the cluster
- :type master_instance_type: str
- :param master_instance_type: EC2 instance type of the master
- :type slave_instance_type: str
- :param slave_instance_type: EC2 instance type of the slave nodes
+ :type main_instance_type: str
+ :param main_instance_type: EC2 instance type of the main
+ :type subordinate_instance_type: str
+ :param subordinate_instance_type: EC2 instance type of the subordinate nodes
:type num_instances: int
:param num_instances: Number of instances in the Hadoop cluster
:type action_on_failure: str
@@ -190,7 +190,7 @@ def run_jobflow(self, name, log_uri, ec2_keyname=None, availability_zone=None,
# Instance args
instance_params = self._build_instance_args(ec2_keyname, availability_zone,
- master_instance_type, slave_instance_type,
+ main_instance_type, subordinate_instance_type,
num_instances, keep_alive, hadoop_version)
params.update(instance_params)
@@ -267,11 +267,11 @@ def _build_step_list(self, steps):
params['Steps.member.%s.%s' % (i+1, key)] = value
return params
- def _build_instance_args(self, ec2_keyname, availability_zone, master_instance_type,
- slave_instance_type, num_instances, keep_alive, hadoop_version):
+ def _build_instance_args(self, ec2_keyname, availability_zone, main_instance_type,
+ subordinate_instance_type, num_instances, keep_alive, hadoop_version):
params = {
- 'Instances.MasterInstanceType' : master_instance_type,
- 'Instances.SlaveInstanceType' : slave_instance_type,
+ 'Instances.MainInstanceType' : main_instance_type,
+ 'Instances.SubordinateInstanceType' : subordinate_instance_type,
'Instances.InstanceCount' : num_instances,
'Instances.KeepJobFlowAliveWhenNoSteps' : str(keep_alive).lower(),
'Instances.HadoopVersion' : hadoop_version
diff --git a/third_party/gsutil/20110627/boto/boto/emr/step.py b/third_party/gsutil/20110627/boto/boto/emr/step.py
index 74bef3a1..0c603178 100644
--- a/third_party/gsutil/20110627/boto/boto/emr/step.py
+++ b/third_party/gsutil/20110627/boto/boto/emr/step.py
@@ -122,7 +122,7 @@ def __init__(self, name, mapper, reducer=None,
:type output: str
:param output: The output uri
:type jar: str
- :param jar: The hadoop streaming jar. This can be either a local path on the master node, or an s3:// URI.
+ :param jar: The hadoop streaming jar. This can be either a local path on the main node, or an s3:// URI.
"""
self.name = name
self.mapper = mapper
diff --git a/third_party/gsutil/20110627/boto/boto/emr/tests/test_emr_responses.py b/third_party/gsutil/20110627/boto/boto/emr/tests/test_emr_responses.py
index 77ec494b..9bcc0ecc 100644
--- a/third_party/gsutil/20110627/boto/boto/emr/tests/test_emr_responses.py
+++ b/third_party/gsutil/20110627/boto/boto/emr/tests/test_emr_responses.py
@@ -70,8 +70,8 @@
us-east-1a
- m1.small
- m1.small
+ m1.small
+ m1.small
myec2keyname
4
true
@@ -266,8 +266,8 @@
j-3H3Q13JPFLU22
- m1.large
- i-64c21609
+ m1.large
+ i-64c21609
us-east-1b
@@ -285,7 +285,7 @@
Job flow terminated
MASTER
ig-EVMHOZJ2SCO8
- master
+ main
2010-10-21T01:00:25Z
@@ -300,13 +300,13 @@
Job flow terminated
CORE
ig-YZHDYVITVHKB
- slave
+ subordinate
40
0.20
- m1.large
- ec2-184-72-153-139.compute-1.amazonaws.com
+ m1.large
+ ec2-184-72-153-139.compute-1.amazonaws.com
myubersecurekey
10
false
@@ -346,8 +346,8 @@ def test_JobFlows_example(self):
loguri='mybucket/subdir/',
name='MyJobFlowName',
availabilityzone='us-east-1a',
- slaveinstancetype='m1.small',
- masterinstancetype='m1.small',
+ subordinateinstancetype='m1.small',
+ maininstancetype='m1.small',
ec2keyname='myec2keyname',
keepjobflowalivewhennosteps='true')
@@ -364,8 +364,8 @@ def test_JobFlows_completed(self):
loguri='s3n://example.emrtest.scripts/jobflow_logs/',
name='RealJobFlowName',
availabilityzone='us-east-1b',
- slaveinstancetype='m1.large',
- masterinstancetype='m1.large',
+ subordinateinstancetype='m1.large',
+ maininstancetype='m1.large',
ec2keyname='myubersecurekey',
keepjobflowalivewhennosteps='false')
self.assertEquals(6, len(jobflow.steps))
diff --git a/third_party/gsutil/20110627/boto/boto/pyami/bootstrap.py b/third_party/gsutil/20110627/boto/boto/pyami/bootstrap.py
index cd44682f..01341dd7 100644
--- a/third_party/gsutil/20110627/boto/boto/pyami/bootstrap.py
+++ b/third_party/gsutil/20110627/boto/boto/pyami/bootstrap.py
@@ -88,7 +88,7 @@ def load_boto(self):
if update.find(':') >= 0:
method, version = update.split(':')
else:
- version = 'master'
+ version = 'main'
self.run('git checkout %s' % version, cwd=location)
else:
# first remove the symlink needed when running from subversion
diff --git a/third_party/gsutil/20110627/boto/boto/rds/__init__.py b/third_party/gsutil/20110627/boto/boto/rds/__init__.py
index 9acf1038..6631db6b 100644
--- a/third_party/gsutil/20110627/boto/boto/rds/__init__.py
+++ b/third_party/gsutil/20110627/boto/boto/rds/__init__.py
@@ -113,7 +113,7 @@ def get_all_dbinstances(self, instance_id=None, max_records=None,
return self.get_list('DescribeDBInstances', params, [('DBInstance', DBInstance)])
def create_dbinstance(self, id, allocated_storage, instance_class,
- master_username, master_password, port=3306,
+ main_username, main_password, port=3306,
engine='MySQL5.1', db_name=None, param_group=None,
security_groups=None, availability_zone=None,
preferred_maintenance_window=None,
@@ -150,13 +150,13 @@ def create_dbinstance(self, id, allocated_storage, instance_class,
:type engine: str
:param engine: Name of database engine. Must be MySQL5.1 for now.
- :type master_username: str
- :param master_username: Name of master user for the DBInstance.
+ :type main_username: str
+ :param main_username: Name of main user for the DBInstance.
Must be 1-15 alphanumeric characters, first
must be a letter.
- :type master_password: str
- :param master_password: Password of master user for the DBInstance.
+ :type main_password: str
+ :param main_password: Password of main user for the DBInstance.
Must be 4-16 alphanumeric characters.
:type port: int
@@ -217,8 +217,8 @@ def create_dbinstance(self, id, allocated_storage, instance_class,
'AllocatedStorage' : allocated_storage,
'DBInstanceClass' : instance_class,
'Engine' : engine,
- 'MasterUsername' : master_username,
- 'MasterUserPassword' : master_password}
+ 'MainUsername' : main_username,
+ 'MainUserPassword' : main_password}
if port:
params['Port'] = port
if db_name:
@@ -321,7 +321,7 @@ def create_dbinstance_read_replica(self, id, source_id,
def modify_dbinstance(self, id, param_group=None, security_groups=None,
preferred_maintenance_window=None,
- master_password=None, allocated_storage=None,
+ main_password=None, allocated_storage=None,
instance_class=None,
backup_retention_period=None,
preferred_backup_window=None,
@@ -343,8 +343,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None,
occur.
Default is Sun:05:00-Sun:09:00
- :type master_password: str
- :param master_password: Password of master user for the DBInstance.
+ :type main_password: str
+ :param main_password: Password of main user for the DBInstance.
Must be 4-15 alphanumeric characters.
:type allocated_storage: int
@@ -402,8 +402,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None,
self.build_list_params(params, l, 'DBSecurityGroups.member')
if preferred_maintenance_window:
params['PreferredMaintenanceWindow'] = preferred_maintenance_window
- if master_password:
- params['MasterUserPassword'] = master_password
+ if main_password:
+ params['MainUserPassword'] = main_password
if allocated_storage:
params['AllocatedStorage'] = allocated_storage
if instance_class:
diff --git a/third_party/gsutil/20110627/boto/boto/rds/dbinstance.py b/third_party/gsutil/20110627/boto/boto/rds/dbinstance.py
index 02f9af6a..71f94fca 100644
--- a/third_party/gsutil/20110627/boto/boto/rds/dbinstance.py
+++ b/third_party/gsutil/20110627/boto/boto/rds/dbinstance.py
@@ -36,7 +36,7 @@ def __init__(self, connection=None, id=None):
self.allocated_storage = None
self.endpoint = None
self.instance_class = None
- self.master_username = None
+ self.main_username = None
self.parameter_group = None
self.security_group = None
self.availability_zone = None
@@ -82,8 +82,8 @@ def endElement(self, name, value, connection):
self.allocated_storage = int(value)
elif name == 'DBInstanceClass':
self.instance_class = value
- elif name == 'MasterUsername':
- self.master_username = value
+ elif name == 'MainUsername':
+ self.main_username = value
elif name == 'Port':
if self._in_endpoint:
self._port = int(value)
@@ -176,7 +176,7 @@ def stop(self, skip_final_snapshot=False, final_snapshot_id=''):
def modify(self, param_group=None, security_groups=None,
preferred_maintenance_window=None,
- master_password=None, allocated_storage=None,
+ main_password=None, allocated_storage=None,
instance_class=None,
backup_retention_period=None,
preferred_backup_window=None,
@@ -195,8 +195,8 @@ def modify(self, param_group=None, security_groups=None,
occur.
Default is Sun:05:00-Sun:09:00
- :type master_password: str
- :param master_password: Password of master user for the DBInstance.
+ :type main_password: str
+ :param main_password: Password of main user for the DBInstance.
Must be 4-15 alphanumeric characters.
:type allocated_storage: int
@@ -245,7 +245,7 @@ def modify(self, param_group=None, security_groups=None,
param_group,
security_groups,
preferred_maintenance_window,
- master_password,
+ main_password,
allocated_storage,
instance_class,
backup_retention_period,
diff --git a/third_party/gsutil/20110627/boto/boto/rds/dbsnapshot.py b/third_party/gsutil/20110627/boto/boto/rds/dbsnapshot.py
index 78d0230c..166501ed 100644
--- a/third_party/gsutil/20110627/boto/boto/rds/dbsnapshot.py
+++ b/third_party/gsutil/20110627/boto/boto/rds/dbsnapshot.py
@@ -33,7 +33,7 @@ def __init__(self, connection=None, id=None):
self.port = None
self.status = None
self.availability_zone = None
- self.master_username = None
+ self.main_username = None
self.allocated_storage = None
self.instance_id = None
self.availability_zone = None
@@ -61,8 +61,8 @@ def endElement(self, name, value, connection):
self.status = value
elif name == 'AvailabilityZone':
self.availability_zone = value
- elif name == 'MasterUsername':
- self.master_username = value
+ elif name == 'MainUsername':
+ self.main_username = value
elif name == 'AllocatedStorage':
self.allocated_storage = int(value)
elif name == 'SnapshotTime':
diff --git a/third_party/gsutil/20110627/boto/docs/source/conf.py b/third_party/gsutil/20110627/boto/docs/source/conf.py
index 459c44fb..24bcd9c1 100644
--- a/third_party/gsutil/20110627/boto/docs/source/conf.py
+++ b/third_party/gsutil/20110627/boto/docs/source/conf.py
@@ -6,7 +6,7 @@
autoclass_content="both"
templates_path = ['_templates']
source_suffix = '.rst'
-master_doc = 'index'
+main_doc = 'index'
project = u'boto'
copyright = u'2009,2010, Mitch Garnaat'
version = '2.0'
diff --git a/third_party/pyscss/docs/conf.py b/third_party/pyscss/docs/conf.py
index 48605aad..dbb101ba 100644
--- a/third_party/pyscss/docs/conf.py
+++ b/third_party/pyscss/docs/conf.py
@@ -40,8 +40,8 @@
# The encoding of source files.
#source_encoding = 'utf-8-sig'
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
# General information about the project.
project = u'python-scss'
diff --git a/tools/upload_sdk.py b/tools/upload_sdk.py
index 4ccfb0ee..d038d569 100644
--- a/tools/upload_sdk.py
+++ b/tools/upload_sdk.py
@@ -12,7 +12,7 @@
import utils
-GSUTIL = '/b/build/scripts/slave/gsutil'
+GSUTIL = '/b/build/scripts/subordinate/gsutil'
GS_SITE = 'gs://'
GS_DIR = 'dart-dump-render-tree'
LATEST = 'latest'