Merge branch 'master' into USERGRID-575
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7395a19e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7395a19e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7395a19e Branch: refs/heads/two-dot-o Commit: 7395a19e28cb2f1e119fac3e1157ea53dccb235d Parents: 11709e0 6135d86 Author: Dave Johnson <dmjohn...@apigee.com> Authored: Mon Apr 20 08:01:24 2015 -0400 Committer: Dave Johnson <dmjohn...@apigee.com> Committed: Mon Apr 20 08:01:24 2015 -0400 ---------------------------------------------------------------------- README.md | 2 +- docs/get_2.0_running_locally.md | 165 +++++++++++++++++++++++++++++++++++ docs/index.md | 3 +- ugc/README.md | 2 +- 4 files changed, 169 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
