Merge branch 'master' of https://github.com/apache/incubator-griffin into 
apache-master


Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/57df9298
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/57df9298
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/57df9298

Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: 57df9298e36dd1360a7189e9324b37dc4a020e1a
Parents: d728138 8e183df
Author: Lionel Liu <bhlx3l...@163.com>
Authored: Tue Mar 6 15:19:22 2018 +0800
Committer: Lionel Liu <bhlx3l...@163.com>
Committed: Tue Mar 6 15:19:22 2018 +0800

----------------------------------------------------------------------
 griffin-doc/FSD.md                              |  64 +++++++++++++------
 griffin-doc/img/fsd/image2018-1-8 12-33-2.png   | Bin 108413 -> 128529 bytes
 griffin-doc/img/fsd/image2018-1-8 12-38-12.png  | Bin 120481 -> 123654 bytes
 griffin-doc/img/fsd/image2018-1-8 12-44-30.png  | Bin 152061 -> 169651 bytes
 griffin-doc/img/fsd/image2018-1-8 12-48-20.png  | Bin 186633 -> 137816 bytes
 griffin-doc/img/fsd/image2018-1-8 12-51-13.png  | Bin 160405 -> 150127 bytes
 griffin-doc/img/fsd/image2018-1-8 13-02-15.png  | Bin 272258 -> 238736 bytes
 griffin-doc/img/fsd/image2018-1-8 13-07-16.png  | Bin 120708 -> 128242 bytes
 griffin-doc/img/fsd/image2018-1-8 13-10-28.png  | Bin 120358 -> 142898 bytes
 griffin-doc/img/fsd/image2018-1-8 13-12-10.png  | Bin 143090 -> 113922 bytes
 griffin-doc/img/fsd/image2018-1-8 13-13-40.png  | Bin 155166 -> 139110 bytes
 griffin-doc/img/fsd/image2018-1-8 13-15-30.png  | Bin 160387 -> 133758 bytes
 griffin-doc/img/fsd/image2018-2-5 14-44-20.png  | Bin 279001 -> 210289 bytes
 griffin-doc/img/fsd/image2018-2-5 14-45-10.png  | Bin 111384 -> 127324 bytes
 griffin-doc/img/fsd/image2018-2-5 14-46-26.png  | Bin 124723 -> 118602 bytes
 griffin-doc/img/fsd/image2018-2-5 14-50-10.png  | Bin 85916 -> 72787 bytes
 griffin-doc/img/fsd/image2018-2-6 10-48-10.png  | Bin 59232 -> 80211 bytes
 griffin-doc/img/fsd/image2018-2-6 10-50-10.png  | Bin 144805 -> 100417 bytes
 griffin-doc/img/fsd/image2018-2-6 10-51-16.png  | Bin 118094 -> 170904 bytes
 griffin-doc/img/fsd/image2018-2-6 11-1-10.png   | Bin 214914 -> 213911 bytes
 griffin-doc/img/fsd/image2018-2-6 11-3-19.png   | Bin 97741 -> 97685 bytes
 griffin-doc/img/userguide/ac_partition.png      | Bin 186633 -> 137816 bytes
 griffin-doc/img/userguide/asset list.png        | Bin 89272 -> 72787 bytes
 griffin-doc/img/userguide/confirm job.png       | Bin 95586 -> 97685 bytes
 griffin-doc/img/userguide/confirm measure.png   | Bin 147534 -> 150127 bytes
 griffin-doc/img/userguide/dashboard big.png     | Bin 118094 -> 170904 bytes
 griffin-doc/img/userguide/job config.png        | Bin 209684 -> 213911 bytes
 griffin-doc/img/userguide/mapping.png           | Bin 202146 -> 169651 bytes
 griffin-doc/img/userguide/measure info.png      | Bin 288214 -> 238736 bytes
 griffin-doc/img/userguide/metrics dashboard.png | Bin 144805 -> 100417 bytes
 griffin-doc/img/userguide/right bar.png         | Bin 59232 -> 80211 bytes
 griffin-doc/img/userguide/source.PNG            | Bin 122418 -> 128529 bytes
 griffin-doc/img/userguide/target.PNG            | Bin 114057 -> 123654 bytes
 griffin-doc/ui/test-case.md                     |   2 +-
 griffin-doc/ui/user-guide.md                    |   6 +-
 ui/angular/src/app/service/chart.service.ts     |   5 +-
 36 files changed, 50 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


Reply via email to