You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2013/10/30 23:22:15 UTC
svn commit: r1537330 [1/7] - in
/hadoop/common/branches/YARN-321/hadoop-common-project: ./
hadoop-annotations/ hadoop-auth/ hadoop-common/ hadoop-common/dev-support/
hadoop-common/src/ hadoop-common/src/main/bin/ hadoop-common/src/main/conf/
hadoop-com...
Author: vinodkv
Date: Wed Oct 30 22:21:59 2013
New Revision: 1537330
URL: http://svn.apache.org/r1537330
Log:
Forwarding YARN-321 branch to latest branch-2.
svn merge ../branch-2
Added:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ByteBufferUtil.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ByteBufferUtil.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DirectoryListingStartAfterNotFoundException.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DirectoryListingStartAfterNotFoundException.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HasEnhancedByteBufferAccess.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HasEnhancedByteBufferAccess.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ReadOption.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ReadOption.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ZeroCopyUnavailableException.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ZeroCopyUnavailableException.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLogAppender.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLogAppender.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ByteBufferPool.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ByteBufferPool.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/LossyRetryInvocationHandler.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/LossyRetryInvocationHandler.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetriableException.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetriableException.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IdentityHashStore.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IdentityHashStore.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLog.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLog.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLogAppender.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLogAppender.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/
- copied from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestFileSink.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestFileSink.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIdentityHashStore.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIdentityHashStore.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/
- copied from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/
- copied from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/resources/test.har/
- copied from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/test.har/
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/AccessPrivilege.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/AccessPrivilege.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcInfo.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcInfo.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcResponse.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcResponse.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/
- copied from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java
- copied unchanged from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/security/
- copied from r1537326, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/security/
Removed:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/VoidResponse.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/AccessPrivilege.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/NfsExports.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAuthInfo.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAuthSys.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcFrameDecoder.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpServerHandler.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServerHandler.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/security/TestNfsExports.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAuthInfo.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAuthSys.java
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/ (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-annotations/pom.xml
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-auth/ (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/ (props changed)
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/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/ (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd (contents, props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/start-all.cmd (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/stop-all.cmd (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
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/CommonConfigurationKeysPublic.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Stat.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAServiceProtocol.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/CachedDNSToSwitchMapping.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNSToSwitchMapping.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/TableMapping.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/SecretManager.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/TokenIdentifier.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/native/native.sln (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/native/native.vcxproj (contents, props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/winutils/libwinutils.vcxproj (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/winutils/winutils.sln (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/winutils/winutils.vcxproj (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/CLITestHelper.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FCStatisticsBaseTest.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextPermissionBase.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellCopy.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSFileContextMainOperations.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestStat.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFcMainOperationsLocalFs.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLifecycle.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestSSLHttpServer.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayWritable.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestBloomMapFile.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestBooleanWritable.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestBytesWritable.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestEnumSetWritable.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapFile.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSetFile.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/nativeio/TestNativeIO.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/filter/TestPatternFilter.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/StaticMapping.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestSwitchMapping.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/KeyStoreTestUtil.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestSSLFactory.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/pom.xml
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/mount/MountResponse.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Base.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3FileAttributes.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Interface.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/SYMLINK3Request.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/WRITE3Request.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/ACCESS3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/COMMIT3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/CREATE3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/FSINFO3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/FSSTAT3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/GETATTR3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/LOOKUP3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/MKDIR3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/NFS3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/PATHCONF3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READ3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READLINK3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/REMOVE3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/RENAME3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/RMDIR3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/SETATTR3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/SYMLINK3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/WRITE3Response.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAcceptedReply.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCall.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcDeniedReply.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcMessage.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcReply.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcUtil.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpClient.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpServer.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServer.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapRequest.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapResponse.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/RpcProgramPortmap.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsTime.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestFileHandle.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAcceptedReply.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcCall.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcCallCache.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcDeniedReply.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcMessage.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcReply.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestXDR.java
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project:r1531125
Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1519784-1537326
Modified: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-annotations/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-annotations/pom.xml?rev=1537330&r1=1537329&r2=1537330&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-annotations/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-annotations/pom.xml Wed Oct 30 22:21:59 2013
@@ -56,6 +56,21 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>jdk1.7</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ <version>1.7</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth:r1519784-1537326
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1531125
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1531125
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1519784-1537326
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=1537330&r1=1537329&r2=1537330&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 Oct 30 22:21:59 2013
@@ -4,6 +4,9 @@ Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
+ HADOOP-8545. Filesystem Implementation for OpenStack Swift
+ (Dmitry Mezhensky, David Dobbins, Stevel via stevel)
+
NEW FEATURES
IMPROVEMENTS
@@ -28,9 +31,6 @@ Release 2.3.0 - UNRELEASED
HADOOP-9618. Add thread which detects GC pauses.
(Todd Lipcon via Colin Patrick McCabe)
- HADOOP-9758. Provide configuration option for FileSystem/FileContext
- symlink resolution. (Andrew Wang via Colin Patrick McCabe)
-
HADOOP-9848. Create a MiniKDC for use with security testing.
(ywskycn via tucu)
@@ -46,18 +46,57 @@ Release 2.3.0 - UNRELEASED
HADOOP-9889. Refresh the Krb5 configuration when creating a new kdc in
Hadoop-MiniKDC (Wei Yan via Sandy Ryza)
+ HADOOP-9915. o.a.h.fs.Stat support on Mac OS X (Binglin Chang via Colin
+ Patrick McCabe)
+
+ HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping.
+ (Junping Du via Colin Patrick McCabe)
+
+ HADOOP-9063. enhance unit-test coverage of class
+ org.apache.hadoop.fs.FileUtil (Ivan A. Veselovsky via jlowe)
+
+ HADOOP-9254. Cover packages org.apache.hadoop.util.bloom,
+ org.apache.hadoop.util.hash (Vadim Bondarev via jlowe)
+
+ HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy (Vadim
+ Bondarev, Andrey Klochkov and Nathan Roberts via jlowe)
+
+ HADOOP-9199. Cover package org.apache.hadoop.io with unit tests (Andrey
+ Klochkov via jeagles)
+
+ HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules
+ (Ivan A. Veselovsky via daryn)
+
+ HADOOP-9494. Excluded auto-generated and examples code from clover reports
+ (Andrey Klochkov via jeagles)
+
+ HADOOP-9897. Add method to get path start position without drive specifier in
+ o.a.h.fs.Path. (Binglin Chang via cnauroth)
+
+ HADOOP-9078. enhance unit-test coverage of class
+ org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
+
+ HDFS-5276. FileSystem.Statistics should use thread-local counters to avoid
+ multi-threaded performance issues on read/write. (Colin Patrick McCabe)
+
+ HADOOP-9291. enhance unit-test coverage of package o.a.h.metrics2 (Ivan A.
+ Veselovsky via jeagles)
+
+ HADOOP-10064. Upgrade to maven antrun plugin version 1.7 (Arpit Agarwal via
+ jeagles)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
BUG FIXES
+ HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize
+ ReflectionUtils.printThreadInfo. (Junping Du via llu)
+
HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error
(Ashwin Shankar via jlowe)
- HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem.
- (Andrew Wang via Colin Patrick McCabe)
-
HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work
with symlinks. (Colin Patrick McCabe via Andrew Wang)
@@ -70,13 +109,27 @@ Release 2.3.0 - UNRELEASED
HADOOP-9865. FileContext#globStatus has a regression with respect to
relative path. (Chuan Lin via Colin Patrick McCabe)
- HADOOP-9877. Fix listing of snapshot directories in globStatus.
- (Binglin Chang via Andrew Wang)
-
HADOOP-9909. org.apache.hadoop.fs.Stat should permit other LANG.
(Shinichi Yamashita via Andrew Wang)
-Release 2.1.1-beta - UNRELEASED
+ HADOOP-9908. Fix NPE when versioninfo properties file is missing (todd)
+
+ HADOOP-9929. Insufficient permissions for a path reported as File Not
+ Found. (Contributed by Colin Patrick McCabe)
+
+ HADOOP-9791. Add a test case covering long paths for new FileUtil access
+ check methods (ivanmi)
+
+ HADOOP-9981. globStatus should minimize its listStatus and getFileStatus
+ calls. (Contributed by Colin Patrick McCabe)
+
+ HADOOP-10006. Compilation failure in trunk for
+ o.a.h.fs.swift.util.JSONUtil (Junping Du via stevel)
+
+ HADOOP-9016. HarFsInputStream.skip(long) must never return negative value.
+ (Ivan A. Veselovsky via jeagles)
+
+Release 2.2.1 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -84,6 +137,81 @@ Release 2.1.1-beta - UNRELEASED
IMPROVEMENTS
+ HADOOP-10046. Print a log message when SSL is enabled.
+ (David S. Wang via wang)
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
+ HADOOP-10028. Malformed ssl-server.xml.example. (Haohui Mai via jing9)
+
+ HADOOP-10030. FsShell -put/copyFromLocal should support Windows local path.
+ (Chuan Liu via cnauroth)
+
+ HADOOP-10031. FsShell -get/copyToLocal/moveFromLocal should support Windows
+ local path. (Chuan Liu via cnauroth)
+
+ HADOOP-10039. Add Hive to the list of projects using
+ AbstractDelegationTokenSecretManager. (Haohui Mai via jing9)
+
+ HADOOP-10040. hadoop.cmd in UNIX format and would not run by default on
+ Windows. (cnauroth)
+
+ HADOOP-10055. FileSystemShell.apt.vm doc has typo "numRepicas".
+ (Akira Ajisaka via cnauroth)
+
+ HADOOP-10072. TestNfsExports#testMultiMatchers fails due to non-deterministic
+ timing around cache expiry check. (cnauroth)
+
+Release 2.2.0 - 2013-10-13
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ HADOOP-9948. Add a config value to CLITestHelper to skip tests on Windows.
+ (Chuan Liu via cnauroth)
+
+ HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik
+ Kambatla via Sandy Ryza)
+
+ HADOOP-9758. Provide configuration option for FileSystem/FileContext
+ symlink resolution. (Andrew Wang via Colin Patrick McCabe)
+
+ HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector
+ (todd)
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
+ HADOOP-9776. HarFileSystem.listStatus() returns invalid authority if port
+ number is empty. (Shanyu Zhao via ivanmi)
+
+ HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem.
+ (Andrew Wang via Colin Patrick McCabe)
+
+ HADOOP-10003. HarFileSystem.listLocatedStatus() fails.
+ (Jason Dere and suresh via suresh)
+
+ HADOOP-10017. Fix NPE in DFSClient#getDelegationToken when doing Distcp
+ from a secured cluster to an insecured cluster. (Haohui Mai via jing9)
+
+Release 2.1.1-beta - 2013-09-23
+
+ INCOMPATIBLE CHANGES
+
+ HADOOP-9944. Fix RpcRequestHeaderProto.callId to be sint32 rather than
+ uint32 since ipc.Client.CONNECTION_CONTEXT_CALL_ID is signed (i.e. -3)
+ (acmurthy)
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
HADOOP-9910. proxy server start and stop documentation wrong
(Andre Kelpe via harsh)
@@ -123,10 +251,21 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via
Sandy Ryza)
+ HADOOP-9945. HAServiceState should have a state for stopped services.
+ (Karthik Kambatla via atm)
+
+ HADOOP-9962. in order to avoid dependency divergence within Hadoop itself
+ lets enable DependencyConvergence. (rvs via tucu)
+
+ HADOOP-9669. Reduce the number of byte array creations and copies in
+ XDR data manipulation. (Haohui Mai via brandonli)
+
OPTIMIZATIONS
BUG FIXES
+ HADOOP-9916. Fix race in ipc.Client retry. (Binglin Chang via llu)
+
HADOOP-9768. chown and chgrp reject users and groups with spaces on platforms
where spaces are otherwise acceptable. (cnauroth)
@@ -174,6 +313,31 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9774. RawLocalFileSystem.listStatus() return absolute paths when
input path is relative on Windows. (Shanyu Zhao via ivanmi)
+ HADOOP-9924. FileUtil.createJarWithClassPath() does not generate relative
+ classpath correctly. (Shanyu Zhao via ivanmi)
+
+ HADOOP-9932. Improper synchronization in RetryCache. (kihwal)
+
+ HADOOP-9958. Add old constructor back to DelegationTokenInformation to
+ unbreak downstream builds. (Andrew Wang)
+
+ HADOOP-9960. Upgrade Jersey version to 1.9. (Karthik Kambatla via atm)
+
+ HADOOP-9557. hadoop-client excludes commons-httpclient. (Lohit Vijayarenu via
+ cnauroth)
+
+ HADOOP-9350. Hadoop not building against Java7 on OSX
+ (Robert Kanter via stevel)
+
+ HADOOP-9961. versions of a few transitive dependencies diverged between hadoop
+ subprojects. (rvs via tucu)
+
+ HADOOP-9977. Hadoop services won't start with different keypass and
+ keystorepass when https is enabled. (cnauroth)
+
+ HADOOP-10005. No need to check INFO severity level is enabled or not.
+ (Jackie Chang via suresh)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
@@ -1844,6 +2008,8 @@ Release 0.23.10 - UNRELEASED
HADOOP-9686. Easy access to final parameters in Configuration (Jason Lowe
via jeagles)
+ HADOOP-8704. add request logging to jetty/httpserver (jeagles)
+
OPTIMIZATIONS
BUG FIXES
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1519784-1537326
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1531125
Modified: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1537330&r1=1537329&r2=1537330&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml Wed Oct 30 22:21:59 2013
@@ -348,4 +348,20 @@
<Method name="waitForServiceToStop" />
<Bug code="JLM" />
</Match>
- </FindBugsFilter>
+
+ <!--
+ OpenStack Swift FS module -closes streams in a different method
+ from where they are opened.
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.fs.swift.snative.SwiftNativeOutputStream"/>
+ <Method name="uploadFileAttempt"/>
+ <Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.fs.swift.snative.SwiftNativeOutputStream"/>
+ <Method name="uploadFilePartAttempt"/>
+ <Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
+ </Match>
+
+</FindBugsFilter>
Modified: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/pom.xml?rev=1537330&r1=1537329&r2=1537330&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/pom.xml Wed Oct 30 22:21:59 2013
@@ -250,7 +250,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.4</version>
</dependency>
</dependencies>
@@ -459,6 +458,10 @@
<exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.c</exclude>
<exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc_encoder.h</exclude>
<exclude>src/test/java/org/apache/hadoop/fs/test-untar.tgz</exclude>
+ <exclude>src/test/resources/test.har/_SUCCESS</exclude>
+ <exclude>src/test/resources/test.har/_index</exclude>
+ <exclude>src/test/resources/test.har/_masterindex</exclude>
+ <exclude>src/test/resources/test.har/part-0</exclude>
</excludes>
</configuration>
</plugin>
@@ -705,9 +708,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>perthread</forkMode>
- <threadCount>${testsThreadCount}</threadCount>
- <parallel>classes</parallel>
+ <forkCount>${testsThreadCount}</forkCount>
<argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -DminiClusterDedicatedDirs=true</argLine>
</configuration>
</plugin>
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src:r1519784-1537326
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1531125
Modified: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd?rev=1537330&r1=1537329&r2=1537330&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd (original)
+++ hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd Wed Oct 30 22:21:59 2013
@@ -146,18 +146,6 @@ if exist %HADOOP_COMMON_HOME%\%HADOOP_CO
set CLASSPATH=!CLASSPATH!;%HADOOP_COMMON_HOME%\%HADOOP_COMMON_DIR%\*
@rem
-@rem add user-specified CLASSPATH last
-@rem
-
-if defined HADOOP_CLASSPATH (
- if defined HADOOP_USER_CLASSPATH_FIRST (
- set CLASSPATH=%HADOOP_CLASSPATH%;%CLASSPATH%;
- ) else (
- set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH%;
- )
-)
-
-@rem
@rem default log directory % file
@rem
@@ -289,4 +277,16 @@ if not "%HADOOP_MAPRED_HOME%\%MAPRED_DIR
set CLASSPATH=!CLASSPATH!;%HADOOP_MAPRED_HOME%\%MAPRED_DIR%\*
)
+@rem
+@rem add user-specified CLASSPATH last
+@rem
+
+if defined HADOOP_CLASSPATH (
+ if defined HADOOP_USER_CLASSPATH_FIRST (
+ set CLASSPATH=%HADOOP_CLASSPATH%;%CLASSPATH%;
+ ) else (
+ set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH%;
+ )
+)
+
:eof
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/start-all.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/stop-all.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties?rev=1537330&r1=1537329&r2=1537330&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties (original)
+++ hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties Wed Oct 30 22:21:59 2013
@@ -240,3 +240,28 @@ log4j.appender.RMSUMMARY.layout.Conversi
#log4j.appender.HSAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
#log4j.appender.HSAUDIT.DatePattern=.yyyy-MM-dd
+# Http Server Request Logs
+#log4j.logger.http.requests.namenode=INFO,namenoderequestlog
+#log4j.appender.namenoderequestlog=org.apache.hadoop.http.HttpRequestLogAppender
+#log4j.appender.namenoderequestlog.Filename=${hadoop.log.dir}/jetty-namenode-yyyy_mm_dd.log
+#log4j.appender.namenoderequestlog.RetainDays=3
+
+#log4j.logger.http.requests.datanode=INFO,datanoderequestlog
+#log4j.appender.datanoderequestlog=org.apache.hadoop.http.HttpRequestLogAppender
+#log4j.appender.datanoderequestlog.Filename=${hadoop.log.dir}/jetty-datanode-yyyy_mm_dd.log
+#log4j.appender.datanoderequestlog.RetainDays=3
+
+#log4j.logger.http.requests.resourcemanager=INFO,resourcemanagerrequestlog
+#log4j.appender.resourcemanagerrequestlog=org.apache.hadoop.http.HttpRequestLogAppender
+#log4j.appender.resourcemanagerrequestlog.Filename=${hadoop.log.dir}/jetty-resourcemanager-yyyy_mm_dd.log
+#log4j.appender.resourcemanagerrequestlog.RetainDays=3
+
+#log4j.logger.http.requests.jobhistory=INFO,jobhistoryrequestlog
+#log4j.appender.jobhistoryrequestlog=org.apache.hadoop.http.HttpRequestLogAppender
+#log4j.appender.jobhistoryrequestlog.Filename=${hadoop.log.dir}/jetty-jobhistory-yyyy_mm_dd.log
+#log4j.appender.jobhistoryrequestlog.RetainDays=3
+
+#log4j.logger.http.requests.nodemanager=INFO,nodemanagerrequestlog
+#log4j.appender.nodemanagerrequestlog=org.apache.hadoop.http.HttpRequestLogAppender
+#log4j.appender.nodemanagerrequestlog.Filename=${hadoop.log.dir}/jetty-nodemanager-yyyy_mm_dd.log
+#log4j.appender.nodemanagerrequestlog.RetainDays=3
Modified: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example?rev=1537330&r1=1537329&r2=1537330&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example (original)
+++ hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example Wed Oct 30 22:21:59 2013
@@ -44,6 +44,7 @@
<value>10000</value>
<description>Truststore reload check interval, in milliseconds.
Default value is 10000 (10 seconds).
+ </description>
</property>
<property>
Propchange: hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1531125
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs:r1519784-1537326