svn commit: r1558303 - in /hadoop/common/branches/HDFS-5535: ./ hadoop-project/pom.xml hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Author: szetszwo
Date: Wed Jan 15 06:06:31 2014
New Revision: 1558303
URL: http://svn.apache.org/r1558303
Log:
Merge r1555021 through r1558254 from trunk.
Modified:
hadoop/common/branches/HDFS-5535/ (props changed)
hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Propchange: hadoop/common/branches/HDFS-5535/
--
Merged /hadoop/common/trunk:r1557039-1558254
Modified: hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml?rev=1558303&r1=1558302&r2=1558303&view=diff
==
--- hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml Wed Jan 15 06:06:31
2014
@@ -760,7 +760,28 @@
com.google.code.findbugs
jsr305
1.3.9
-
+
+
+javax.xml.bind
+jaxb-api
+2.2.2
+
+
+org.codehaus.jettison
+jettison
+1.1
+
+
+com.sun.jersey
+jersey-client
+${jersey.version}
+
+
+
+org.glassfish.grizzly
+grizzly-http-servlet
+2.1.2
+
Modified:
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java?rev=1558303&r1=1558302&r2=1558303&view=diff
==
---
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Wed Jan 15 06:06:31 2014
@@ -860,4 +860,9 @@ public class ResourceSchedulerWrapper im
public List getAppsInQueue(String queue) {
return scheduler.getAppsInQueue(queue);
}
+
+ @Override
+ public RMContainer getRMContainer(ContainerId containerId) {
+return null;
+ }
}
svn commit: r1558303 - in /hadoop/common/branches/HDFS-5535/hadoop-common-project: hadoop-common/ hadoop-common/src/main/java/ hadoop-common/src/main/java/org/apache/hadoop/conf/ hadoop-common/src/mai
Author: szetszwo
Date: Wed Jan 15 06:06:31 2014
New Revision: 1558303
URL: http://svn.apache.org/r1558303
Log:
Merge r1555021 through r1558254 from trunk.
Modified:
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationDeprecation.java
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
Modified:
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558303&r1=1558302&r2=1558303&view=diff
==
---
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jan 15 06:06:31 2014
@@ -430,6 +430,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10173. Remove UGI from DIGEST-MD5 SASL server creation (daryn via
kihwal)
+HADOOP-10228. FsPermission#fromShort() should cache FsAction.values().
+(Haohui Mai via cnauroth)
+
BUG FIXES
HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize
@@ -511,6 +514,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10214. Fix multithreaded correctness warnings in
ActiveStandbyElector
(Liang Xie via kasha)
+HADOOP-10223. MiniKdc#main() should close the FileReader it creates.
+(Ted Yu via tucu)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -596,6 +602,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-10193. hadoop-auth's PseudoAuthenticationHandler can consume
getInputStream.
(gchanan via tucu)
+HADOOP-10178. Configuration deprecation always emit "deprecated" warnings
+when a new key is used. (Shanyu Zhao via cnauroth)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
@@ -1323,6 +1332,18 @@ Release 2.1.0-beta - 2013-08-22
HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu)
+Release 2.0.6-alpha - 08/22/2013
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1557039-1558254
Propchange:
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1557039-1558254
Modified:
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1558303&r1=1558302&r2=1558303&view=diff
==
---
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Wed Jan 15 06:06:31 2014
@@ -553,36 +553,6 @@ public class Configuration implements It
}
/**
- * Returns the alternate name for a key if the property name is deprecated
- * or if deprecates a property name.
- *
- * @param name property name.
- * @return alternate name.
- */
- private String[] getAlternateNames(String name) {
-String altNames[] = null;
-DeprecationContext cur = deprecationContext.get();
-DeprecatedKeyInfo keyInfo = cur.getDeprecatedKeyMap().get(name);
-if (keyInfo == null) {
- altNames = (cur.getReverseDeprecatedKeyMap().get(name) != null ) ?
-new String [] {cur.getReverseDeprecatedKeyMap().get(name)} : null;
- if(altNames != null && altNames.length > 0) {
- //To help look for other new configs for this deprecated config
- keyInf
svn commit: r1558298 - in /hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop.cmd
Author: cnauroth Date: Wed Jan 15 05:48:44 2014 New Revision: 1558298 URL: http://svn.apache.org/r1558298 Log: HADOOP-10234. Merging change r1558297 from branch-2 to branch-2.3 Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558298&r1=1558297&r2=1558298&view=diff == --- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 15 05:48:44 2014 @@ -88,6 +88,8 @@ Release 2.3.0 - UNRELEASED HADOOP-10178. Configuration deprecation always emit "deprecated" warnings when a new key is used. (Shanyu Zhao via cnauroth) +HADOOP-10234. "hadoop.cmd jar" does not propagate exit code. (cnauroth) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1558298&r1=1558297&r2=1558298&view=diff == --- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (original) +++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Wed Jan 15 05:48:44 2014 @@ -143,7 +143,7 @@ call :updatepath %HADOOP_BIN_PATH% call %JAVA% %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %hadoop-command-arguments% - goto :eof + exit /b %ERRORLEVEL% :fs set CLASS=org.apache.hadoop.fs.FsShell
svn commit: r1558297 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop.cmd
Author: cnauroth Date: Wed Jan 15 05:46:44 2014 New Revision: 1558297 URL: http://svn.apache.org/r1558297 Log: HADOOP-10234. Merging change r1558296 from trunk to branch-2. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558297&r1=1558296&r2=1558297&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 15 05:46:44 2014 @@ -312,6 +312,8 @@ Release 2.3.0 - UNRELEASED HADOOP-10178. Configuration deprecation always emit "deprecated" warnings when a new key is used. (Shanyu Zhao via cnauroth) +HADOOP-10234. "hadoop.cmd jar" does not propagate exit code. (cnauroth) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1558297&r1=1558296&r2=1558297&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Wed Jan 15 05:46:44 2014 @@ -143,7 +143,7 @@ call :updatepath %HADOOP_BIN_PATH% call %JAVA% %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %hadoop-command-arguments% - goto :eof + exit /b %ERRORLEVEL% :fs set CLASS=org.apache.hadoop.fs.FsShell
svn commit: r1558296 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop.cmd
Author: cnauroth Date: Wed Jan 15 05:45:24 2014 New Revision: 1558296 URL: http://svn.apache.org/r1558296 Log: HADOOP-10234. "hadoop.cmd jar" does not propagate exit code. Contributed by Chris Nauroth. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558296&r1=1558295&r2=1558296&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 15 05:45:24 2014 @@ -605,6 +605,8 @@ Release 2.3.0 - UNRELEASED HADOOP-10178. Configuration deprecation always emit "deprecated" warnings when a new key is used. (Shanyu Zhao via cnauroth) +HADOOP-10234. "hadoop.cmd jar" does not propagate exit code. (cnauroth) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1558296&r1=1558295&r2=1558296&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Wed Jan 15 05:45:24 2014 @@ -143,7 +143,7 @@ call :updatepath %HADOOP_BIN_PATH% call %JAVA% %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %hadoop-command-arguments% - goto :eof + exit /b %ERRORLEVEL% :fs set CLASS=org.apache.hadoop.fs.FsShell
svn commit: r1558246 - in /hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/ src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Author: vinodkv
Date: Wed Jan 15 00:32:47 2014
New Revision: 1558246
URL: http://svn.apache.org/r1558246
Log:
YARN-321. Forwarding YARN-321 branch to latest trunk.
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558246&r1=1558245&r2=1558246&view=diff
==
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jan 15 00:32:47 2014
@@ -430,6 +430,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10173. Remove UGI from DIGEST-MD5 SASL server creation (daryn via
kihwal)
+HADOOP-10228. FsPermission#fromShort() should cache FsAction.values().
+(Haohui Mai via cnauroth)
+
BUG FIXES
HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize
@@ -1329,6 +1332,18 @@ Release 2.1.0-beta - 2013-08-22
HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu)
+Release 2.0.6-alpha - 08/22/2013
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1557890-1558245
Propchange:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1557890-1558245
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java?rev=1558246&r1=1558245&r2=1558246&view=diff
==
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
(original)
+++
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Wed Jan 15 00:32:47 2014
@@ -120,8 +120,7 @@ public class FsPermission implements Wri
}
public void fromShort(short n) {
-FsAction[] v = FsAction.values();
-
+FsAction[] v = FSACTION_VALUES;
set(v[(n >>> 6) & 7], v[(n >>> 3) & 7], v[n & 7], (((n >>> 9) & 1) == 1) );
}
@@ -210,6 +209,8 @@ public class FsPermission implements Wri
public static final int DEFAULT_UMASK =
CommonConfigurationKeys.FS_PERMISSIONS_UMASK_DEFAULT;
+ private static final FsAction[] FSACTION_VALUES = FsAction.values();
+
/**
* Get the user file creation mask (umask)
*
svn commit: r1558246 - /hadoop/common/branches/YARN-321/
Author: vinodkv Date: Wed Jan 15 00:32:47 2014 New Revision: 1558246 URL: http://svn.apache.org/r1558246 Log: YARN-321. Forwarding YARN-321 branch to latest trunk. Modified: hadoop/common/branches/YARN-321/ (props changed) Propchange: hadoop/common/branches/YARN-321/ -- Merged /hadoop/common/trunk:r1557890-1558245
svn commit: r1558222 - /hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cos Date: Tue Jan 14 22:06:24 2014 New Revision: 1558222 URL: http://svn.apache.org/r1558222 Log: Adding 2.0.6-alpha release to the CHANGES.txt Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558222&r1=1558221&r2=1558222&view=diff == --- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 14 22:06:24 2014 @@ -842,6 +842,18 @@ Release 2.1.0-beta - 2013-08-22 HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu) +Release 2.0.6-alpha - 08/22/2013 + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + Release 2.0.5-alpha - 06/06/2013 INCOMPATIBLE CHANGES
svn commit: r1558216 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cos Date: Tue Jan 14 21:52:06 2014 New Revision: 1558216 URL: http://svn.apache.org/r1558216 Log: Adding 2.0.6-alpha release to the CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558216&r1=1558215&r2=1558216&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 14 21:52:06 2014 @@ -1067,6 +1067,18 @@ Release 2.1.0-beta - 2013-08-22 HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu) +Release 2.0.6-alpha - 08/22/2013 + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + Release 2.0.5-alpha - 06/06/2013 INCOMPATIBLE CHANGES
svn commit: r1558215 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cos Date: Tue Jan 14 21:49:59 2014 New Revision: 1558215 URL: http://svn.apache.org/r1558215 Log: Adding 2.0.6-alpha release to the CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558215&r1=1558214&r2=1558215&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 14 21:49:59 2014 @@ -1332,6 +1332,18 @@ Release 2.1.0-beta - 2013-08-22 HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu) +Release 2.0.6-alpha - 08/22/2013 + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + Release 2.0.5-alpha - 06/06/2013 INCOMPATIBLE CHANGES
svn commit: r1558146 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Author: cnauroth
Date: Tue Jan 14 18:25:17 2014
New Revision: 1558146
URL: http://svn.apache.org/r1558146
Log:
HADOOP-10228. Merging change r1557236 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558146&r1=1558145&r2=1558146&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Jan 14 18:25:17 2014
@@ -133,6 +133,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10173. Remove UGI from DIGEST-MD5 SASL server creation (daryn via
kihwal)
+HADOOP-10228. FsPermission#fromShort() should cache FsAction.values().
+(Haohui Mai via cnauroth)
+
BUG FIXES
HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java?rev=1558146&r1=1558145&r2=1558146&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Tue Jan 14 18:25:17 2014
@@ -120,8 +120,7 @@ public class FsPermission implements Wri
}
public void fromShort(short n) {
-FsAction[] v = FsAction.values();
-
+FsAction[] v = FSACTION_VALUES;
set(v[(n >>> 6) & 7], v[(n >>> 3) & 7], v[n & 7], (((n >>> 9) & 1) == 1) );
}
@@ -210,6 +209,8 @@ public class FsPermission implements Wri
public static final int DEFAULT_UMASK =
CommonConfigurationKeys.FS_PERMISSIONS_UMASK_DEFAULT;
+ private static final FsAction[] FSACTION_VALUES = FsAction.values();
+
/**
* Get the user file creation mask (umask)
*
svn commit: r1558139 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Author: cnauroth
Date: Tue Jan 14 18:20:18 2014
New Revision: 1558139
URL: http://svn.apache.org/r1558139
Log:
HADOOP-10228. FsPermission#fromShort() should cache FsAction.values().
Contributed by Haohui Mai.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558139&r1=1558138&r2=1558139&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan
14 18:20:18 2014
@@ -430,6 +430,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10173. Remove UGI from DIGEST-MD5 SASL server creation (daryn via
kihwal)
+HADOOP-10228. FsPermission#fromShort() should cache FsAction.values().
+(Haohui Mai via cnauroth)
+
BUG FIXES
HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java?rev=1558139&r1=1558138&r2=1558139&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
Tue Jan 14 18:20:18 2014
@@ -120,8 +120,7 @@ public class FsPermission implements Wri
}
public void fromShort(short n) {
-FsAction[] v = FsAction.values();
-
+FsAction[] v = FSACTION_VALUES;
set(v[(n >>> 6) & 7], v[(n >>> 3) & 7], v[n & 7], (((n >>> 9) & 1) == 1) );
}
@@ -210,6 +209,8 @@ public class FsPermission implements Wri
public static final int DEFAULT_UMASK =
CommonConfigurationKeys.FS_PERMISSIONS_UMASK_DEFAULT;
+ private static final FsAction[] FSACTION_VALUES = FsAction.values();
+
/**
* Get the user file creation mask (umask)
*
