Merge branch 'master' into 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/e6c3f08f Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e6c3f08f Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e6c3f08f Branch: refs/heads/two-dot-o-push-notifications Commit: e6c3f08fa308a354408046f7d2b6826a3cd56148 Parents: b0aee9e cd4915a Author: Dave Johnson Authored: Fri Aug 29 17:39:23 2014 -0400 Committer: Dave Johnson Committed: Fri Aug 29 17:39:23 2014 -0400 ---------------------------------------------------------------------- .gitignore | 2 ++ portal/Gruntfile.js | 4 ---- release/pom.xml | 2 +- stack/pom.xml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e6c3f08f/.gitignore ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e6c3f08f/stack/pom.xml ----------------------------------------------------------------------