Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c3c71c91 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c3c71c91 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c3c71c91 Branch: refs/heads/USERGRID-933 Commit: c3c71c91472045789f06e525d1028061240e0613 Parents: 98e76ae f24e7e4 Author: Shawn Feldman <sfeld...@apache.org> Authored: Fri Sep 11 17:11:07 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Fri Sep 11 17:11:07 2015 -0600 ---------------------------------------------------------------------- .../asyncevents/AmazonAsyncEventService.java | 6 +++--- stack/scripts/migrate_entity_data.py | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
