Merge remote-tracking branch 'origin/USERGRID-1048'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5f62e4c1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5f62e4c1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5f62e4c1 Branch: refs/heads/usergrid-1007-shiro-cache Commit: 5f62e4c167ec12ec0378d65b162e3db0481f7d07 Parents: b51287c e50835f Author: Shawn Feldman <[email protected]> Authored: Tue Oct 20 11:43:47 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Tue Oct 20 11:43:47 2015 -0600 ---------------------------------------------------------------------- .../asyncevents/AmazonAsyncEventService.java | 2 +- .../core/astyanax/CassandraConfig.java | 8 ++--- .../core/astyanax/CassandraConfigImpl.java | 1 + .../map/impl/MapSerializationImpl.java | 37 ++++---------------- .../queue/impl/SNSQueueManagerImpl.java | 4 +-- 5 files changed, 14 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
