d637c71e4d
Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-project/pom.xml git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68
17 lines
370 B
Plaintext
17 lines
370 B
Plaintext
*.iml
|
|
*.ipr
|
|
*.iws
|
|
*.orig
|
|
*.rej
|
|
.idea
|
|
.svn
|
|
.classpath
|
|
.project
|
|
.settings
|
|
target
|
|
hadoop-common-project/hadoop-kms/downloads/
|
|
hadoop-hdfs-project/hadoop-hdfs/downloads
|
|
hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads
|
|
hadoop-common-project/hadoop-common/src/test/resources/contract-test-options.xml
|
|
hadoop-tools/hadoop-openstack/src/test/resources/contract-test-options.xml
|