You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by qi...@apache.org on 2016/04/25 05:35:25 UTC
[1/2] incubator-eagle git commit: change dataSource to application in
ALERT_DEFAULT.vm
Repository: incubator-eagle
Updated Branches:
refs/heads/master ed270c9e3 -> 99b25759c
change dataSource to application in ALERT_DEFAULT.vm
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/5d82c610
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/5d82c610
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/5d82c610
Branch: refs/heads/master
Commit: 5d82c61099416c99e3a3f011d0851c0589ddf383
Parents: ed270c9
Author: Zhao, Qingwen <qi...@ebay.com>
Authored: Fri Apr 22 11:08:57 2016 +0800
Committer: Zhao, Qingwen <qi...@ebay.com>
Committed: Fri Apr 22 11:08:57 2016 +0800
----------------------------------------------------------------------
.../src/main/resources/ALERT_DEFAULT.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/5d82c610/eagle-core/eagle-alert/eagle-alert-notification-plugin/src/main/resources/ALERT_DEFAULT.vm
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert/eagle-alert-notification-plugin/src/main/resources/ALERT_DEFAULT.vm b/eagle-core/eagle-alert/eagle-alert-notification-plugin/src/main/resources/ALERT_DEFAULT.vm
index 887d759..0a044f6 100644
--- a/eagle-core/eagle-alert/eagle-alert-notification-plugin/src/main/resources/ALERT_DEFAULT.vm
+++ b/eagle-core/eagle-alert/eagle-alert-notification-plugin/src/main/resources/ALERT_DEFAULT.vm
@@ -209,7 +209,7 @@
<p>$elem["site"]</p>
</td>
<td>
- <p>$elem["dataSource"]</p>
+ <p>$elem["application"]</p>
</td>
</tr>
<tr>
[2/2] incubator-eagle git commit: Fix
java.lang.ClassNotFoundException: org.slf4j.impl.Log4jLoggerAdapter
Posted by qi...@apache.org.
Fix java.lang.ClassNotFoundException: org.slf4j.impl.Log4jLoggerAdapter
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/99b25759
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/99b25759
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/99b25759
Branch: refs/heads/master
Commit: 99b25759c0f742bea27a60773808bf5b8ceffc3d
Parents: 5d82c61
Author: Zhao, Qingwen <qi...@ebay.com>
Authored: Fri Apr 22 17:48:37 2016 +0800
Committer: Zhao, Qingwen <qi...@ebay.com>
Committed: Fri Apr 22 17:48:37 2016 +0800
----------------------------------------------------------------------
eagle-assembly/src/assembly/eagle-bin.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/99b25759/eagle-assembly/src/assembly/eagle-bin.xml
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/assembly/eagle-bin.xml b/eagle-assembly/src/assembly/eagle-bin.xml
index 141a6a7..336dcef 100644
--- a/eagle-assembly/src/assembly/eagle-bin.xml
+++ b/eagle-assembly/src/assembly/eagle-bin.xml
@@ -216,8 +216,10 @@
<include>slf4j-*.jar</include>
<include>log4j-*.jar</include>
<include>commons-math3-*.jar</include>
- <include>slf4j-log4j12-*.jar</include>
</includes>
+ <excludes>
+ <exclude>slf4j-log4j12-*.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>${project.basedir}/target/lib</directory>