Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into upstream/two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fadee4af Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fadee4af Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fadee4af Branch: refs/heads/two-dot-o Commit: fadee4af4b0354b931eab9e70e1cf57b507dd17a Parents: 51b8c8e 2d08b25 Author: Rod Simpson <[email protected]> Authored: Thu Nov 6 15:03:47 2014 -0700 Committer: Rod Simpson <[email protected]> Committed: Thu Nov 6 15:03:47 2014 -0700 ---------------------------------------------------------------------- .../apache/usergrid/services/users/devices/DevicesService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
