Skip to content

sync with apache #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chicm wants to merge 3 commits into from
Closed

sync with apache #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
803265d
Merge pull request #1 from apache/master
chicm Nov 6, 2014
b55d958
Revert "update"
chicm Nov 24, 2014
e091048
Merge pull request #2 from chicm/revert-1-master
chicm Nov 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions bin/hbase.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,7 @@ if "%servercommand%" == "true" (
if defined service_entry (
set HBASE_LOG_PREFIX=hbase-%hbase-command%-%COMPUTERNAME%
set HBASE_LOGFILE=!HBASE_LOG_PREFIX!.log
if not defined HBASE_ROOT_LOGGER (
set HBASE_ROOT_LOGGER=INFO,DRFA
)
set HBASE_ROOT_LOGGER=INFO,DRFA
set HBASE_SECURITY_LOGGER=INFO,DRFAS
set loggc=!HBASE_LOG_DIR!\!HBASE_LOG_PREFIX!.gc
set loglog=!HBASE_LOG_DIR!\!HBASE_LOGFILE!
Expand Down
142 changes: 0 additions & 142 deletions dev-support/make_patch.sh
View file
Open in desktop

This file was deleted.

204 changes: 0 additions & 204 deletions dev-support/rebase_all_git_branches.sh
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions dev-support/test-patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,18 +517,14 @@ checkCheckstyleErrors() {

JIRA_COMMENT="$JIRA_COMMENT

{color:red}-1 checkstyle{color}. The applied patch generated $patchCheckstyleErrors checkstyle errors (more than the trunk's current $trunkCheckstyleErrors errors)."
{color:red}-1 javac{color}. The applied patch generated $patchCheckstyleErrors checkstyle errors (more than the trunk's current $trunkCheckstyleErrors errors)."
return 1
fi
echo "There were $patchCheckstyleErrors checkstyle errors in this patch compared to $trunkCheckstyleErrors on master."
fi
JIRA_COMMENT_FOOTER="Checkstyle Errors: $BUILD_URL/artifact/patchprocess/checkstyle-aggregate.html

$JIRA_COMMENT_FOOTER"

JIRA_COMMENT="$JIRA_COMMENT

{color:green}+1 checkstyle{color}. The applied patch does not increase the total number of checkstyle errors"
{color:green}+1 javac{color}. The applied patch does not increase the total number of checkstyle errors"
return 0

}
Expand Down Expand Up @@ -583,7 +579,7 @@ checkReleaseAuditWarnings () {
{color:red}-1 release audit{color}. The applied patch generated $patchReleaseAuditWarnings release audit warnings (more than the trunk's current $OK_RELEASEAUDIT_WARNINGS warnings)."
$GREP '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt > $PATCH_DIR/patchReleaseAuditProblems.txt
echo "Lines that start with ????? in the release audit report indicate files that do not have an Apache license header." >> $PATCH_DIR/patchReleaseAuditProblems.txt
JIRA_COMMENT_FOOTER="Release audit warnings: $BUILD_URL/artifact/patchprocess/patchReleaseAuditWarnings.txt
JIRA_COMMENT_FOOTER="Release audit warnings: $BUILD_URL/artifact/trunk/patchprocess/patchReleaseAuditProblems.txt
$JIRA_COMMENT_FOOTER"
return 1
fi
Expand Down
Loading