You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/09/17 00:34:58 UTC
[hbase] branch HBASE-25049 updated (6416beb -> a91ea0f)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch HBASE-25049
in repository https://gitbox.apache.org/repos/asf/hbase.git.
discard 6416beb remove protobuf message
discard cd7afc0 disable other stages
discard c059b5f exclude com.google.protobuf when relocating
new d11ced7 exclude com.google.protobuf when relocating
new a91ea0f disable other stages
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6416beb)
\
N -- N -- N refs/heads/HBASE-25049 (a91ea0f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 1 +
hbase-shaded/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[hbase] 02/02: disable other stages
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-25049
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit a91ea0fd27adec02d0facbfe1bf8d7f574a6b3a0
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Sep 16 22:21:05 2020 +0800
disable other stages
---
dev-support/Jenkinsfile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 5aaefd8..312f9f1 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -195,6 +195,9 @@ pipeline {
label 'Hadoop'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
BASEDIR = "${env.WORKSPACE}/component"
TESTS = "${env.SHALLOW_CHECKS}"
@@ -423,9 +426,9 @@ pipeline {
}
}
when {
- not {
+ //not {
branch 'branch-1*'
- }
+ //}
}
environment {
BASEDIR = "${env.WORKSPACE}/component"
@@ -508,9 +511,9 @@ pipeline {
}
}
when {
- not {
+ //not {
branch 'branch-1*'
- }
+ //}
}
environment {
BASEDIR = "${env.WORKSPACE}/component"
[hbase] 01/02: exclude com.google.protobuf when relocating
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-25049
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit d11ced79776f3054487744539136f750eec1b83a
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Sep 16 22:18:36 2020 +0800
exclude com.google.protobuf when relocating
---
hbase-shaded/pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 88832ba..5f38130 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -189,6 +189,9 @@
<relocation>
<pattern>com.google</pattern>
<shadedPattern>${shaded.prefix}.com.google</shadedPattern>
+ <excludes>
+ <exclude>com.google.protobuf.*</exclude>
+ </excludes>
</relocation>
<relocation>
<pattern>com.jamesmurty</pattern>