You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/11/11 16:45:38 UTC
[skywalking] 01/01: Fixed some nits
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch minikube
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit b3bbbdaee0ca1a66ce53bb71055ef1aad3116109
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Nov 12 00:42:46 2019 +0800
Fixed some nits
---
.github/workflows/istio-mixer-ci.yaml | 16 ++++++++++
Jenkinsfile-E2E-Mesh | 36 ----------------------
.../server-starter/src/main/resources/log4j2.xml | 2 +-
3 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/istio-mixer-ci.yaml b/.github/workflows/istio-mixer-ci.yaml
index 03bc7ff..fe43946 100644
--- a/.github/workflows/istio-mixer-ci.yaml
+++ b/.github/workflows/istio-mixer-ci.yaml
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
name: istio-mixer-ci
on: [push]
diff --git a/Jenkinsfile-E2E-Mesh b/Jenkinsfile-E2E-Mesh
deleted file mode 100644
index 496df1b..0000000
--- a/Jenkinsfile-E2E-Mesh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-pipeline {
- agent {
- label 'jenkins-skywalking5'
- }
-
- options {
- timestamps()
- timeout(time: 5, unit: 'HOURS')
- }
-
- stages {
- stage('Test') {
- steps {
- sh 'whoami'
- sh 'sudo ls -lt /root'
- }
- }
-}
diff --git a/oap-server/server-starter/src/main/resources/log4j2.xml b/oap-server/server-starter/src/main/resources/log4j2.xml
index fc300a2..72dcf43 100644
--- a/oap-server/server-starter/src/main/resources/log4j2.xml
+++ b/oap-server/server-starter/src/main/resources/log4j2.xml
@@ -35,7 +35,7 @@
<logger name="org.apache.skywalking.oap.server.core" level="INFO"/>
<logger name="org.apache.skywalking.oap.server.core.remote.client" level="DEBUG"/>
<logger name="org.apache.skywalking.oap.server.library.buffer" level="INFO"/>
-<!-- <logger name="org.apache.skywalking.oap.server.receiver.so11y" level="DEBUG" />-->
+ <logger name="org.apache.skywalking.oap.server.receiver.so11y" level="DEBUG" />
<Root level="DEBUG">
<AppenderRef ref="Console"/>
</Root>