You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2016/08/11 06:49:48 UTC
incubator-eagle git commit: [EAGLE-404] Updating configuration format
check at the front end
Repository: incubator-eagle
Updated Branches:
refs/heads/branch-0.4 edce7a5dc -> 5631cac79
[EAGLE-404] Updating configuration format check at the front end
https://issues.apache.org/jira/browse/EAGLE-404
Author: Zhao, Qingwen <qi...@ebay.com>
Closes #287 from qingwen220/EAGLE-404.
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/5631cac7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/5631cac7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/5631cac7
Branch: refs/heads/branch-0.4
Commit: 5631cac79799da576e1af0103bf5cb242d223c74
Parents: edce7a5
Author: Zhao, Qingwen <qi...@ebay.com>
Authored: Thu Aug 11 14:49:35 2016 +0800
Committer: Hao Chen <ha...@apache.org>
Committed: Thu Aug 11 14:49:35 2016 +0800
----------------------------------------------------------------------
eagle-assembly/src/main/bin/eagle-topology-init.sh | 2 +-
eagle-webservice/src/main/webapp/app/public/js/common.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/5631cac7/eagle-assembly/src/main/bin/eagle-topology-init.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-topology-init.sh b/eagle-assembly/src/main/bin/eagle-topology-init.sh
index dc9dd59..a8035ed 100755
--- a/eagle-assembly/src/main/bin/eagle-topology-init.sh
+++ b/eagle-assembly/src/main/bin/eagle-topology-init.sh
@@ -25,7 +25,7 @@ eagle_bin=$EAGLE_HOME/bin
## AlertDataSource: data sources bound to sites
-echo "Begin to initialize HBase tables ..."
+echo "Begin to initialize metadata for eagle topologies ..."
echo ""
echo "Importing sample site ..."
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/5631cac7/eagle-webservice/src/main/webapp/app/public/js/common.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/public/js/common.js b/eagle-webservice/src/main/webapp/app/public/js/common.js
index 4c5e82f..f94b58f 100644
--- a/eagle-webservice/src/main/webapp/app/public/js/common.js
+++ b/eagle-webservice/src/main/webapp/app/public/js/common.js
@@ -176,7 +176,7 @@ common.properties.parse = function (str, defaultValue) {
common.properties.check = function (str) {
var pass = true;
- var regex = /^\s*[\w\.]+\s*=(.*)$/;
+ var regex = /^\s*[\w\.-]+\s*=(.*)$/;
$.each((str || "").trim().split(/[\r\n\s]+/g), function (i, line) {
if(!regex.test(line)) {
pass = false;