MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw)
This commit is contained in:
parent
6c790a7ab0
commit
d989ac0444
@ -997,7 +997,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||||||
}
|
}
|
||||||
getOverlay().setProperty(name, value);
|
getOverlay().setProperty(name, value);
|
||||||
getProps().setProperty(name, value);
|
getProps().setProperty(name, value);
|
||||||
String newSource = (source == null ? "programatically" : source);
|
String newSource = (source == null ? "programmatically" : source);
|
||||||
|
|
||||||
if (!isDeprecated(name)) {
|
if (!isDeprecated(name)) {
|
||||||
updatingResource.put(name, new String[] {newSource});
|
updatingResource.put(name, new String[] {newSource});
|
||||||
@ -1471,7 +1471,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||||||
/**
|
/**
|
||||||
* Gets information about why a property was set. Typically this is the
|
* Gets information about why a property was set. Typically this is the
|
||||||
* path to the resource objects (file, URL, etc.) the property came from, but
|
* path to the resource objects (file, URL, etc.) the property came from, but
|
||||||
* it can also indicate that it was set programatically, or because of the
|
* it can also indicate that it was set programmatically, or because of the
|
||||||
* command line.
|
* command line.
|
||||||
*
|
*
|
||||||
* @param name - The property name to get the source of.
|
* @param name - The property name to get the source of.
|
||||||
|
@ -63,7 +63,7 @@ public class TestConfServlet extends TestCase {
|
|||||||
String resource = (String)propertyInfo.get("resource");
|
String resource = (String)propertyInfo.get("resource");
|
||||||
System.err.println("k: " + key + " v: " + val + " r: " + resource);
|
System.err.println("k: " + key + " v: " + val + " r: " + resource);
|
||||||
if (TEST_KEY.equals(key) && TEST_VAL.equals(val)
|
if (TEST_KEY.equals(key) && TEST_VAL.equals(val)
|
||||||
&& "programatically".equals(resource)) {
|
&& "programmatically".equals(resource)) {
|
||||||
foundSetting = true;
|
foundSetting = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -821,8 +821,8 @@ public class TestConfiguration extends TestCase {
|
|||||||
fileResource,
|
fileResource,
|
||||||
new Path(sources[0]));
|
new Path(sources[0]));
|
||||||
assertArrayEquals("Resource string returned for a set() property must be " +
|
assertArrayEquals("Resource string returned for a set() property must be " +
|
||||||
"\"programatically\"",
|
"\"programmatically\"",
|
||||||
new String[]{"programatically"},
|
new String[]{"programmatically"},
|
||||||
conf.getPropertySources("fs.defaultFS"));
|
conf.getPropertySources("fs.defaultFS"));
|
||||||
assertEquals("Resource string returned for an unset property must be null",
|
assertEquals("Resource string returned for an unset property must be null",
|
||||||
null, conf.getPropertySources("fs.defaultFoo"));
|
null, conf.getPropertySources("fs.defaultFoo"));
|
||||||
@ -1101,7 +1101,7 @@ public class TestConfiguration extends TestCase {
|
|||||||
confDump.put(prop.getKey(), prop);
|
confDump.put(prop.getKey(), prop);
|
||||||
}
|
}
|
||||||
assertEquals("value5",confDump.get("test.key6").getValue());
|
assertEquals("value5",confDump.get("test.key6").getValue());
|
||||||
assertEquals("programatically", confDump.get("test.key4").getResource());
|
assertEquals("programmatically", confDump.get("test.key4").getResource());
|
||||||
outWriter.close();
|
outWriter.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ import org.apache.hadoop.hdfs.server.namenode.FSEditLogLoader.PositionTrackingIn
|
|||||||
/**
|
/**
|
||||||
* OfflineImageViewer to dump the contents of an Hadoop image file to XML
|
* OfflineImageViewer to dump the contents of an Hadoop image file to XML
|
||||||
* or the console. Main entry point into utility, either via the
|
* or the console. Main entry point into utility, either via the
|
||||||
* command line or programatically.
|
* command line or programmatically.
|
||||||
*/
|
*/
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
public class OfflineImageViewer {
|
public class OfflineImageViewer {
|
||||||
|
@ -39,7 +39,7 @@ import org.apache.hadoop.net.NetUtils;
|
|||||||
/**
|
/**
|
||||||
* OfflineImageViewerPB to dump the contents of an Hadoop image file to XML or
|
* OfflineImageViewerPB to dump the contents of an Hadoop image file to XML or
|
||||||
* the console. Main entry point into utility, either via the command line or
|
* the console. Main entry point into utility, either via the command line or
|
||||||
* programatically.
|
* programmatically.
|
||||||
*/
|
*/
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
public class OfflineImageViewerPB {
|
public class OfflineImageViewerPB {
|
||||||
|
@ -154,6 +154,9 @@ Trunk (Unreleased)
|
|||||||
MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to
|
MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to
|
||||||
ProportionalCapacityPreemptionPolicy (Sunil G via devaraj)
|
ProportionalCapacityPreemptionPolicy (Sunil G via devaraj)
|
||||||
|
|
||||||
|
MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other
|
||||||
|
places) (Akira AJISAKA via aw)
|
||||||
|
|
||||||
Release 2.6.0 - UNRELEASED
|
Release 2.6.0 - UNRELEASED
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
@ -1333,7 +1333,7 @@ MapReduce Application Master REST API's.
|
|||||||
{
|
{
|
||||||
"value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
|
"value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
|
||||||
"name" : "hadoop.http.filter.initializers"
|
"name" : "hadoop.http.filter.initializers"
|
||||||
"source" : ["programatically", "job.xml"]
|
"source" : ["programmatically", "job.xml"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value" : "/home/hadoop/tmp",
|
"value" : "/home/hadoop/tmp",
|
||||||
@ -1379,7 +1379,7 @@ MapReduce Application Master REST API's.
|
|||||||
<property>
|
<property>
|
||||||
<name>hadoop.http.filter.initializers</name>
|
<name>hadoop.http.filter.initializers</name>
|
||||||
<value>org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer</value>
|
<value>org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer</value>
|
||||||
<source>programatically</source>
|
<source>programmatically</source>
|
||||||
<source>job.xml</source>
|
<source>job.xml</source>
|
||||||
</property>
|
</property>
|
||||||
<property>
|
<property>
|
||||||
|
@ -1311,7 +1311,7 @@ MapReduce History Server REST API's.
|
|||||||
{
|
{
|
||||||
"value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
|
"value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
|
||||||
"name" : "hadoop.http.filter.initializers"
|
"name" : "hadoop.http.filter.initializers"
|
||||||
"source" : ["programatically", "job.xml"]
|
"source" : ["programmatically", "job.xml"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value" : "/home/hadoop/tmp",
|
"value" : "/home/hadoop/tmp",
|
||||||
@ -1357,7 +1357,7 @@ MapReduce History Server REST API's.
|
|||||||
<property>
|
<property>
|
||||||
<name>hadoop.http.filter.initializers</name>
|
<name>hadoop.http.filter.initializers</name>
|
||||||
<value>org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer</value>
|
<value>org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer</value>
|
||||||
<source>programatically</source>
|
<source>programmatically</source>
|
||||||
<source>job.xml</source>
|
<source>job.xml</source>
|
||||||
</property>
|
</property>
|
||||||
<property>
|
<property>
|
||||||
|
@ -1504,7 +1504,7 @@ setDocument = Sizzle.setDocument = function( node ) {
|
|||||||
|
|
||||||
// Support: IE<10
|
// Support: IE<10
|
||||||
// Check if getElementById returns elements by name
|
// Check if getElementById returns elements by name
|
||||||
// The broken getElementById methods don't pick up programatically-set names,
|
// The broken getElementById methods don't pick up programmatically-set names,
|
||||||
// so use a roundabout getElementsByName test
|
// so use a roundabout getElementsByName test
|
||||||
support.getById = assert(function( div ) {
|
support.getById = assert(function( div ) {
|
||||||
docElem.appendChild( div ).id = expando;
|
docElem.appendChild( div ).id = expando;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user