Merge branch 'release-2.1.1'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d8d1dedc Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d8d1dedc Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d8d1dedc Branch: refs/heads/master Commit: d8d1dedcbe7a23e370f0f9ee208e1e78634d565a Parents: a652838 56c995f Author: Michael Russo <[email protected]> Authored: Thu Mar 3 11:05:50 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Mar 3 11:05:50 2016 -0800 ---------------------------------------------------------------------- .../model/entity/MapToEntityConverter.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
