Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/56b6785d Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/56b6785d Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/56b6785d Branch: refs/heads/griffin-0.1.6-incubating-rc0 Commit: 56b6785d182ab7db0b7b4ce65def313283df675f Parents: 290a020 df44514 Author: William Guo <guo...@icloud.com> Authored: Fri Jul 21 15:02:05 2017 +0800 Committer: William Guo <guo...@icloud.com> Committed: Fri Jul 21 15:02:05 2017 +0800 ---------------------------------------------------------------------- service/pom.xml | 6 ------ .../apache/griffin/core/common/JsonConvert.java | 18 ++++++++++++++++++ .../griffin/core/common/PropertiesOperate.java | 19 ++++++++++++++++++- 3 files changed, 36 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
