Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw)

This commit is contained in:
Allen Wittenauer 2014-09-08 13:15:46 -07:00
parent 6c790a7ab0
commit d989ac0444
9 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -997,7 +997,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
}
getOverlay().setProperty(name, value);
getProps().setProperty(name, value);
String newSource = (source == null ? "programatically" : source);
String newSource = (source == null ? "programmatically" : source);
if (!isDeprecated(name)) {
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
* 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.
*
* @param name - The property name to get the source of.

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
View File

@ -63,7 +63,7 @@ public class TestConfServlet extends TestCase {
String resource = (String)propertyInfo.get("resource");
System.err.println("k: " + key + " v: " + val + " r: " + resource);
if (TEST_KEY.equals(key) && TEST_VAL.equals(val)
&& "programatically".equals(resource)) {
&& "programmatically".equals(resource)) {
foundSetting = true;
}
}

6
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
View File

@ -821,8 +821,8 @@ public class TestConfiguration extends TestCase {
fileResource,
new Path(sources[0]));
assertArrayEquals("Resource string returned for a set() property must be " +
"\"programatically\"",
new String[]{"programatically"},
"\"programmatically\"",
new String[]{"programmatically"},
conf.getPropertySources("fs.defaultFS"));
assertEquals("Resource string returned for an unset property must be null",
null, conf.getPropertySources("fs.defaultFoo"));
@ -1101,7 +1101,7 @@ public class TestConfiguration extends TestCase {
confDump.put(prop.getKey(), prop);
}
assertEquals("value5",confDump.get("test.key6").getValue());
assertEquals("programatically", confDump.get("test.key4").getResource());
assertEquals("programmatically", confDump.get("test.key4").getResource());
outWriter.close();
}

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
View File

@ -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
* or the console. Main entry point into utility, either via the
* command line or programatically.
* command line or programmatically.
*/
@InterfaceAudience.Private
public class OfflineImageViewer {

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java
View File

@ -39,7 +39,7 @@ import org.apache.hadoop.net.NetUtils;
/**
* 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
* programatically.
* programmatically.
*/
@InterfaceAudience.Private
public class OfflineImageViewerPB {

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -154,6 +154,9 @@ Trunk (Unreleased)
MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to
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
INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapredAppMasterRest.apt.vm
View File

@ -1333,7 +1333,7 @@ MapReduce Application Master REST API's.
{
"value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
"name" : "hadoop.http.filter.initializers"
"source" : ["programatically", "job.xml"]
"source" : ["programmatically", "job.xml"]
},
{
"value" : "/home/hadoop/tmp",
@ -1379,7 +1379,7 @@ MapReduce Application Master REST API's.
<property>
<name>hadoop.http.filter.initializers</name>
<value>org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer</value>
<source>programatically</source>
<source>programmatically</source>
<source>job.xml</source>
</property>
<property>

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/apt/HistoryServerRest.apt.vm
View File

@ -1311,7 +1311,7 @@ MapReduce History Server REST API's.
{
"value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
"name" : "hadoop.http.filter.initializers"
"source" : ["programatically", "job.xml"]
"source" : ["programmatically", "job.xml"]
},
{
"value" : "/home/hadoop/tmp",
@ -1357,7 +1357,7 @@ MapReduce History Server REST API's.
<property>
<name>hadoop.http.filter.initializers</name>
<value>org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer</value>
<source>programatically</source>
<source>programmatically</source>
<source>job.xml</source>
</property>
<property>

2
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js vendored
View File

@ -1504,7 +1504,7 @@ setDocument = Sizzle.setDocument = function( node ) {
// Support: IE<10
// 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
support.getById = assert(function( div ) {
docElem.appendChild( div ).id = expando;