Merge commit 'refs/pull/577/head' of github.com:apache/usergrid into debug_logging
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f25ac99f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f25ac99f Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f25ac99f Branch: refs/heads/debug_logging Commit: f25ac99f3409dc708a5cdddbee6520913b8ac6ea Parents: a769f30 76e9e94 Author: Mike Dunker <mdun...@google.com> Authored: Mon Oct 16 17:16:47 2017 -0700 Committer: Mike Dunker <mdun...@google.com> Committed: Mon Oct 16 17:16:47 2017 -0700 ---------------------------------------------------------------------- .../MvccEntitySerializationStrategyV3Impl.java | 20 +++++- .../persistence/core/util/DebugUtils.java | 73 ++++++++++++++++++++ .../index/impl/EsEntityIndexImpl.java | 14 ++++ .../rest/filters/ContentTypeFilter.java | 21 ++++++ .../usergrid/services/AbstractService.java | 22 ++++++ 5 files changed, 148 insertions(+), 2 deletions(-) ----------------------------------------------------------------------