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

HADOOP-11596. Allow smart-apply-patch.sh to add new files in binary git patches (raviprak)

This commit is contained in:
Ravi Prakash 2015-02-17 11:13:47 -08:00
parent db6606223c
commit 13d1ba9965
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-support/smart-apply-patch.sh
View File

@ -38,8 +38,8 @@ is_git_diff_with_prefix() {
fi
if [[ "$line" =~ ^\+\+\+\ ]] ||
[[ "$line" =~ ^\-\-\-\ ]]; then
if ! [[ "$line" =~ ^....[ab]/ ]]; then
return 1 # All +++ and --- lines must start with a/ or b/.
if ! [[ "$line" =~ ^....[ab]/ || "$line" =~ ^..../dev/null ]]; then
return 1 # All +++ and --- lines must start with a/ or b/ or be /dev/null.
fi
fi
done < $1

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

@ -612,6 +612,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11522. Update S3A Documentation. (Thomas Demoor via stevel)
HADOOP-11596. Allow smart-apply-patch.sh to add new files in binary git
patches (raviprak)
OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array.