Merge commit 'refs/pull/578/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/3c285e0c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3c285e0c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3c285e0c Branch: refs/heads/debug_logging Commit: 3c285e0c378e47f4ab35dc7495cfc1b2c8363fde Parents: f25ac99 433f4ef Author: Mike Dunker <mdun...@google.com> Authored: Tue Oct 17 11:49:52 2017 -0700 Committer: Mike Dunker <mdun...@google.com> Committed: Tue Oct 17 11:49:52 2017 -0700 ---------------------------------------------------------------------- .../MvccEntitySerializationStrategyV3Impl.java | 7 +++-- .../index/impl/EsEntityIndexImpl.java | 32 +++++++++++++++++++- .../rest/filters/ContentTypeFilter.java | 2 +- 3 files changed, 36 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
