Merge branch 'release'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/40be90f5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/40be90f5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/40be90f5 Branch: refs/heads/USERGRID-1047 Commit: 40be90f5ea69d73e487fc9f079247c15a1cc0691 Parents: 78727e1 595955d Author: Michael Russo <michaelaru...@gmail.com> Authored: Sat Jan 23 18:02:06 2016 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Sat Jan 23 18:02:06 2016 -0800 ---------------------------------------------------------------------- .../corepersistence/CpEntityMapUtilsTest.java | 28 +++++++++++++- .../model/entity/MapToEntityConverter.java | 39 +++++++++----------- .../model/entity/MapToEntityConverterTest.java | 4 +- 3 files changed, 44 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/40be90f5/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverterTest.java ----------------------------------------------------------------------
