hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r1532967 - in /hadoop/common/branches/HDFS-4949: ./ hadoop-assemblies/src/main/resources/assemblies/ hadoop-client/ hadoop-project/ hadoop-project/src/site/ hadoop-tools/ hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapr...
Date Thu, 17 Oct 2013 05:32:54 GMT
Author: wang
Date: Thu Oct 17 05:32:42 2013
New Revision: 1532967

URL: http://svn.apache.org/r1532967
Log:
merge the rest of trunk to branch HDFS-4949

Added:
    hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/   (props changed)
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/dev-support/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/dev-support/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/dev-support/findbugs-exclude.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/dev-support/findbugs-exclude.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/pom.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/pom.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/ApiKeyAuthenticationRequest.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/ApiKeyAuthenticationRequest.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/ApiKeyCredentials.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/ApiKeyCredentials.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationRequest.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationRequest.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationRequestWrapper.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationRequestWrapper.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationResponse.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationResponse.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationWrapper.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/AuthenticationWrapper.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/KeyStoneAuthRequest.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/KeyStoneAuthRequest.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/KeystoneApiKeyCredentials.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/KeystoneApiKeyCredentials.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/PasswordAuthenticationRequest.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/PasswordAuthenticationRequest.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/PasswordCredentials.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/PasswordCredentials.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/Roles.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/Roles.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/AccessToken.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/AccessToken.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/Catalog.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/Catalog.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/Endpoint.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/Endpoint.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/Tenant.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/Tenant.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/User.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/auth/entities/User.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftAuthenticationFailedException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftAuthenticationFailedException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftBadRequestException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftBadRequestException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftConfigurationException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftConfigurationException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftConnectionClosedException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftConnectionClosedException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftConnectionException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftConnectionException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftInternalStateException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftInternalStateException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftInvalidResponseException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftInvalidResponseException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftJsonMarshallingException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftJsonMarshallingException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftNotDirectoryException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftNotDirectoryException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftOperationFailedException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftOperationFailedException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftPathExistsException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftPathExistsException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftThrottledRequestException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftThrottledRequestException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftUnsupportedFeatureException.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/exceptions/SwiftUnsupportedFeatureException.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/CopyMethod.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/CopyMethod.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/ExceptionDiags.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/ExceptionDiags.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpBodyContent.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpBodyContent.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/RestClientBindings.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/RestClientBindings.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftProtocolConstants.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftProtocolConstants.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/package.html
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/package.html
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/StrictBufferedFSInputStream.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/StrictBufferedFSInputStream.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftFileStatus.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftFileStatus.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystem.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystem.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystemStore.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystemStore.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeOutputStream.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeOutputStream.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftObjectFileStatus.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftObjectFileStatus.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/Duration.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/Duration.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/DurationStats.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/DurationStats.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/DurationStatsTable.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/DurationStatsTable.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/JSONUtil.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/JSONUtil.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/SwiftObjectPath.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/SwiftObjectPath.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/SwiftTestUtils.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/SwiftTestUtils.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/SwiftUtils.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/SwiftUtils.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/site/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/site/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/site/apt/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/site/apt/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/site/apt/index.apt.vm
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/site/apt/index.apt.vm
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/site/site.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/site/site.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/AcceptAllFilter.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/AcceptAllFilter.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/SwiftFileSystemBaseTest.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/SwiftFileSystemBaseTest.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/SwiftTestConstants.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/SwiftTestConstants.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestFSMainOperationsSwift.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestFSMainOperationsSwift.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestLogResources.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestLogResources.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestReadPastBuffer.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestReadPastBuffer.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSeek.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSeek.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftConfig.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftConfig.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBlockLocation.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBlockLocation.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBlocksize.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBlocksize.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemConcurrency.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemConcurrency.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemContract.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemContract.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemDelete.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemDelete.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemDirectories.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemDirectories.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemExtendedContract.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemExtendedContract.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemLsOperations.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemLsOperations.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemPartitionedUploads.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemPartitionedUploads.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemRead.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemRead.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemRename.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemRename.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftObjectPath.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftObjectPath.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/hdfs2/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/hdfs2/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/hdfs2/TestSwiftFileSystemDirectoriesHdfs2.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/hdfs2/TestSwiftFileSystemDirectoriesHdfs2.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/hdfs2/TestV2LsOperations.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/hdfs2/TestV2LsOperations.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/http/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/http/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/http/TestRestClientBindings.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/http/TestRestClientBindings.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/http/TestSwiftRestClient.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/http/TestSwiftRestClient.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/scale/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/scale/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/scale/SwiftScaleTestBase.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/scale/SwiftScaleTestBase.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/scale/TestWriteManySmallFiles.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/scale/TestWriteManySmallFiles.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/resources/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/resources/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/resources/core-site.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/resources/core-site.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/src/test/resources/log4j.properties
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-openstack/src/test/resources/log4j.properties
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/   (props changed)
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/README
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/README
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/dev-support/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/dev-support/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/pom.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/assemblies/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/assemblies/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/bin/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/bin/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/data/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/data/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/css/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/css/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/js/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3-LICENSE
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3-LICENSE
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/simulate.html.template
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/simulate.html.template
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/html/track.html.template
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/track.html.template
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/sample-conf/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler-allocation.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler-allocation.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/apt/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/apt/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/apt/SchedulerLoadSimulator.apt.vm
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/apt/SchedulerLoadSimulator.apt.vm
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/css/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/css/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/css/site.css
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/css/site.css
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_JVM.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_JVM.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_arch.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_arch.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_memory.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_memory.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_vcores.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_vcores.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_memory.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_memory.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_vcores.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_vcores.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_running_apps_containers.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_running_apps_containers.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_scheduler_operation_timecost.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_scheduler_operation_timecost.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_job.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_job.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_queue.png
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_queue.png
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/resources/
      - copied from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/resources/track.html.template
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/track.html.template
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
      - copied unchanged from r1532945, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
Modified:
    hadoop/common/branches/HDFS-4949/   (props changed)
    hadoop/common/branches/HDFS-4949/.gitattributes
    hadoop/common/branches/HDFS-4949/BUILDING.txt
    hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
    hadoop/common/branches/HDFS-4949/hadoop-client/pom.xml
    hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml
    hadoop/common/branches/HDFS-4949/hadoop-project/src/site/site.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd   (props changed)
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd   (props changed)
    hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-tools-dist/pom.xml
    hadoop/common/branches/HDFS-4949/hadoop-tools/pom.xml
    hadoop/common/branches/HDFS-4949/pom.xml

Propchange: hadoop/common/branches/HDFS-4949/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2:r1526848
  Merged /hadoop/common/trunk:r1522707-1532945

Modified: hadoop/common/branches/HDFS-4949/.gitattributes
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/.gitattributes?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/.gitattributes (original)
+++ hadoop/common/branches/HDFS-4949/.gitattributes Thu Oct 17 05:32:42 2013
@@ -15,5 +15,6 @@
 
 *.bat    text eol=crlf
 *.cmd    text eol=crlf
+*.vcxproj text merge=union eol=crlf
 *.csproj text merge=union eol=crlf
 *.sln    text merge=union eol=crlf

Modified: hadoop/common/branches/HDFS-4949/BUILDING.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/BUILDING.txt?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/BUILDING.txt (original)
+++ hadoop/common/branches/HDFS-4949/BUILDING.txt Thu Oct 17 05:32:42 2013
@@ -4,8 +4,8 @@ Build instructions for Hadoop
 Requirements:
 
 * Unix System
-* JDK 1.6
-* Maven 3.0
+* JDK 1.6+
+* Maven 3.0 or later
 * Findbugs 1.3.9 (if running findbugs)
 * ProtocolBuffer 2.5.0
 * CMake 2.6 or newer (if compiling native code)
@@ -149,13 +149,32 @@ Create a local staging version of the we
 
 ----------------------------------------------------------------------------------
 
+Handling out of memory errors in builds
+
+----------------------------------------------------------------------------------
+
+If the build process fails with an out of memory error, you should be able to fix
+it by increasing the memory used by maven -which can be done via the environment
+variable MAVEN_OPTS.
+
+Here is an example setting to allocate between 256 and 512 MB of heap space to
+Maven
+
+export MAVEN_OPTS="-Xms256m -Xmx512m"
+
+----------------------------------------------------------------------------------
+
 Building on OS/X
 
 ----------------------------------------------------------------------------------
 
-Hadoop does not build on OS/X with Java 7.
+A one-time manual step is required to enable building Hadoop OS X with Java 7
+every time the JDK is updated.
 see: https://issues.apache.org/jira/browse/HADOOP-9350
 
+$ sudo mkdir `/usr/libexec/java_home`/Classes
+$ sudo ln -s `/usr/libexec/java_home`/lib/tools.jar `/usr/libexec/java_home`/Classes/classes.jar
+
 ----------------------------------------------------------------------------------
 
 Building on Windows

Modified: hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml Thu Oct 17 05:32:42 2013
@@ -93,6 +93,17 @@
         <include>*-sources.jar</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../hadoop-sls/target</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+      <includes>
+        <include>*-sources.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../hadoop-sls/target/hadoop-sls-${project.version}/sls</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/sls</outputDirectory>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>

Modified: hadoop/common/branches/HDFS-4949/hadoop-client/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-client/pom.xml?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-client/pom.xml Thu Oct 17 05:32:42 2013
@@ -40,10 +40,6 @@
       <scope>compile</scope>
       <exclusions>
         <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>tomcat</groupId>
           <artifactId>jasper-compiler</artifactId>
         </exclusion>

Modified: hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml Thu Oct 17 05:32:42 2013
@@ -59,6 +59,12 @@
     <hadoop.common.build.dir>${basedir}/../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
     <java.security.egd>file:///dev/urandom</java.security.egd>
 
+    <!-- avro version -->
+    <avro.version>1.7.4</avro.version>
+
+    <!-- jersey version -->
+    <jersey.version>1.9</jersey.version>
+
     <!-- ProtocolBuffer version, used to verify the protoc version and -->
     <!-- define the protobuf JAR version                               -->
     <protobuf.version>2.5.0</protobuf.version>
@@ -301,6 +307,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-openstack</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <version>11.0.2</version>
@@ -316,6 +328,11 @@
         <version>2.1</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>1.4.1</version>
+      </dependency>
+      <dependency>
         <groupId>xmlenc</groupId>
         <artifactId>xmlenc</artifactId>
         <version>0.52</version>
@@ -326,6 +343,11 @@
         <version>3.1</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.2.5</version>
+      </dependency>
+      <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.4</version>
@@ -358,6 +380,23 @@
       </dependency>
 
       <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.servlet</artifactId>
+        <version>3.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>2.0.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-annotations</artifactId>
+        <version>1.5.5</version>
+      </dependency>
+
+      <dependency>
         <groupId>asm</groupId>
         <artifactId>asm</artifactId>
         <version>3.2</version>
@@ -365,12 +404,12 @@
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-core</artifactId>
-        <version>1.8</version>
+        <version>${jersey.version}</version>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-json</artifactId>
-        <version>1.8</version>
+        <version>${jersey.version}</version>
         <exclusions>
           <exclusion>
             <groupId>javax.xml.stream</groupId>
@@ -381,7 +420,7 @@
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-server</artifactId>
-        <version>1.8</version>
+        <version>${jersey.version}</version>
       </dependency>
 
       <dependency>
@@ -399,25 +438,25 @@
       <dependency>
         <groupId>com.sun.jersey.contribs</groupId>
         <artifactId>jersey-guice</artifactId>
-        <version>1.8</version>
+        <version>${jersey.version}</version>
       </dependency>
 
       <dependency>
         <groupId>com.sun.jersey.jersey-test-framework</groupId>
         <artifactId>jersey-test-framework-core</artifactId>
-        <version>1.8</version>
+        <version>${jersey.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey.jersey-test-framework</groupId>
         <artifactId>jersey-test-framework-grizzly2</artifactId>
-        <version>1.8</version>
+        <version>${jersey.version}</version>
       </dependency>
 
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty</artifactId>
-        <version>3.5.11.Final</version>
+        <version>3.6.2.Final</version>
       </dependency>
 
       <dependency>
@@ -605,7 +644,7 @@
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>
-        <version>1.7.4</version>
+        <version>${avro.version}</version>
       </dependency>
       <dependency>
         <groupId>net.sf.kosmosfs</groupId>
@@ -646,7 +685,7 @@
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
-        <version>3.4.2</version>
+        <version>3.4.5</version>
         <exclusions>
           <exclusion>
             <!-- otherwise seems to drag in junit 3.8.1 via jline -->
@@ -661,14 +700,24 @@
             <groupId>com.sun.jmx</groupId>
             <artifactId>jmxri</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
-        <version>3.4.2</version>
+        <version>3.4.5</version>
         <type>test-jar</type>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.bookkeeper</groupId>
@@ -681,6 +730,16 @@
         <artifactId>hsqldb</artifactId>
         <version>2.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.codahale.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-sls</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -703,7 +762,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.1</version>
+          <version>2.2</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -763,7 +822,7 @@
         <plugin>
           <groupId>org.apache.avro</groupId>
           <artifactId>avro-maven-plugin</artifactId>
-          <version>1.5.3</version>
+          <version>${avro.version}</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo.jspc</groupId>
@@ -871,6 +930,26 @@
           <includeReports>false</includeReports>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>depcheck</id>
+            <configuration>
+              <rules>
+                <DependencyConvergence>
+                  <uniqueVersions>true</uniqueVersions> 
+                </DependencyConvergence>
+              </rules>
+            </configuration>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>verify</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Modified: hadoop/common/branches/HDFS-4949/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-project/src/site/site.xml?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-project/src/site/site.xml Thu Oct 17 05:32:42 2013
@@ -86,6 +86,7 @@
       <item name="Compatibilty between Hadoop 1.x and Hadoop 2.x" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html"/>
       <item name="Encrypted Shuffle" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html"/>
       <item name="Pluggable Shuffle/Sort" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/PluggableShuffleAndPluggableSort.html"/>
+      <item name="Distributed Cache Deploy" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/DistributedCacheDeploy.html"/>
     </menu>
 
     <menu name="YARN" inherit="top">
@@ -95,6 +96,7 @@
       <item name="Fair Scheduler" href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/>
       <item name="Web Application Proxy" href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
       <item name="YARN Commands" href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/>
+      <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
     </menu>
 
     <menu name="YARN REST APIs" inherit="top">

Modified: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java Thu Oct 17 05:32:42 2013
@@ -332,6 +332,7 @@ public class TestCopyCommitter {
     } finally {
       TestDistCpUtils.delete(fs, workPath);
       TestDistCpUtils.delete(fs, finalPath);
+      conf.setBoolean(DistCpConstants.CONF_LABEL_ATOMIC_COPY, false);
     }
   }
 
@@ -373,6 +374,7 @@ public class TestCopyCommitter {
     } finally {
       TestDistCpUtils.delete(fs, workPath);
       TestDistCpUtils.delete(fs, finalPath);
+      conf.setBoolean(DistCpConstants.CONF_LABEL_ATOMIC_COPY, false);
     }
   }
 

Modified: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java Thu Oct 17 05:32:42 2013
@@ -75,6 +75,7 @@ public class TestCopyMapper {
     Configuration configuration = new Configuration();
     System.setProperty("test.build.data", "target/tmp/build/TEST_COPY_MAPPER/data");
     configuration.set("hadoop.log.dir", "target/tmp");
+    configuration.set("dfs.namenode.fs-limits.min-block-size", "0");
     LOG.debug("fs.default.name  == " + configuration.get("fs.default.name"));
     LOG.debug("dfs.http.address == " + configuration.get("dfs.http.address"));
     return configuration;

Modified: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java Thu Oct 17 05:32:42 2013
@@ -122,11 +122,9 @@ public class DebugJobProducer implements
       // Add/remove excess
       recs[0] += totalrecs - tot_recs;
       bytes[0] += totalbytes - tot_bytes;
-      if (LOG.isInfoEnabled()) {
-        LOG.info(
-          "DIST: " + Arrays.toString(recs) + " " + tot_recs + "/" + totalrecs +
-            " " + Arrays.toString(bytes) + " " + tot_bytes + "/" + totalbytes);
-      }
+      LOG.info(
+        "DIST: " + Arrays.toString(recs) + " " + tot_recs + "/" + totalrecs +
+          " " + Arrays.toString(bytes) + " " + tot_bytes + "/" + totalbytes);
     }
 
     private static final AtomicInteger seq = new AtomicInteger(0);

Propchange: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-openstack/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 17 05:32:42 2013
@@ -0,0 +1 @@
+target

Propchange: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-sls/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 17 05:32:42 2013
@@ -0,0 +1 @@
+target

Propchange: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-tools-dist/pom.xml Thu Oct 17 05:32:42 2013
@@ -77,6 +77,17 @@
       <type>pom</type>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-openstack</artifactId>
+      <scope>compile</scope>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-sls</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: hadoop/common/branches/HDFS-4949/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-tools/pom.xml?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-tools/pom.xml Thu Oct 17 05:32:42 2013
@@ -40,6 +40,8 @@
     <module>hadoop-tools-dist</module>
     <module>hadoop-extras</module>
     <module>hadoop-pipes</module>
+    <module>hadoop-openstack</module>
+    <module>hadoop-sls</module>
   </modules>
 
   <build>

Modified: hadoop/common/branches/HDFS-4949/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/pom.xml?rev=1532967&r1=1532966&r2=1532967&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/pom.xml (original)
+++ hadoop/common/branches/HDFS-4949/pom.xml Thu Oct 17 05:32:42 2013
@@ -107,8 +107,13 @@ xsi:schemaLocation="http://maven.apache.
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.0</version>
+          <version>1.3.1</version>
           <configuration>
             <rules>
               <requireMavenVersion>
@@ -224,7 +229,7 @@ xsi:schemaLocation="http://maven.apache.
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.1,)</versionRange>
+                    <versionRange>[2.4,)</versionRange>
                     <goals>
                       <goal>copy-dependencies</goal>
                       <goal>build-classpath</goal>
@@ -551,6 +556,19 @@ xsi:schemaLocation="http://maven.apache.
               <generateHtml>${cloverGenHtml}</generateHtml>
               <generateXml>${cloverGenXml}</generateXml>
               <generateHistorical>${cloverGenHistorical}</generateHistorical>
+              <excludes>
+                <exclude>**/examples/**/*.java</exclude>
+                <exclude>**/hamlet/*.java</exclude>
+                <exclude>**/ha/proto/*.java</exclude>
+                <exclude>**/protocol/proto/*.java</exclude>
+                <exclude>**/compiler/generated/*.java</exclude>
+                <exclude>**/protobuf/*.java</exclude>
+                <exclude>**/v2/proto/*.java</exclude>
+                <exclude>**/yarn/proto/*.java</exclude>
+                <exclude>**/security/proto/*.java</exclude>
+                <exclude>**/tools/proto/*.java</exclude>
+                <exclude>**/hs/proto/*.java</exclude>
+              </excludes>
             </configuration>
             <executions>
               <execution>



Mime
View raw message