Merge branch 'pr/33'
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/c3c67818 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/c3c67818 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/c3c67818 Branch: refs/heads/master Commit: c3c678184d8f08619ed23e4450dd3f466dd863fd Parents: 3e35842 edf3868 Author: Abdelkader Midani <[email protected]> Authored: Fri Nov 3 15:41:29 2017 +0100 Committer: Abdelkader Midani <[email protected]> Committed: Fri Nov 3 15:41:29 2017 +0100 ---------------------------------------------------------------------- .../unomi/sfdc/services/SFDCConfiguration.java | 33 +++--- .../sfdc/services/internal/SFDCServiceImpl.java | 103 +++++++++++++------ .../resources/OSGI-INF/blueprint/blueprint.xml | 3 + .../main/resources/org.apache.unomi.sfdc.cfg | 3 +- 4 files changed, 95 insertions(+), 47 deletions(-) ----------------------------------------------------------------------
