Merge commit 'refs/pull/470/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/94910522 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/94910522 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/94910522 Branch: refs/heads/master Commit: 94910522628e90dc1b789ebc7ba459d87d4a5673 Parents: 6c08e29 6c502aa Author: Michael Russo <michaelaru...@gmail.com> Authored: Mon Jan 25 16:03:44 2016 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Mon Jan 25 16:03:44 2016 -0800 ---------------------------------------------------------------------- .../ElasticsearchExecutionExceptionMapper.java | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) ----------------------------------------------------------------------