Code Review / vnfsdk / refrepo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 108730b) | patch
Resolve the merge conflict
authorYILI <li.yi101@zte.com.cn>
Tue, 14 Mar 2017 01:51:58 +0000 (09:51 +0800)
committer6092002077 <li.yi101@zte.com.cn>
Tue, 14 Mar 2017 01:51:58 +0000 (09:51 +0800)
commit1e6e927eea306eda17e8966215d4f57566472bf2
treeed1e4b64d9d37340835c7d3527a0c025f490562dtree | snapshot
parent108730b2f8fe2a95e826bc0144ad84a632a92656commit | diff
Resolve the merge conflict

read rule manager gui list,inclode query and table list

Issue-ID:CLIENT-151

Change-Id: Ie5b932cef60f86e106e074565ab1a249ec0c5125
Signed-off-by: YILI <li.yi101@zte.com.cn>
13 files changed:
alarm-analysis/src/main/webapp/alarm/app/app.module.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.service.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-modal/msg.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.html diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.service.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/ruleRequest.ts diff | blob | history
alarm-analysis/src/main/webapp/alarm/index.html diff | blob | history
alarm-analysis/src/main/webapp/alarm/vendor.ts diff | blob | history
This repository is for a reference vnf repository