Merge branch 'pr/212'
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/17d85077 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/17d85077 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/17d85077 Branch: refs/heads/two-dot-o-dev Commit: 17d85077ab38f0526eca7cbe852493ac28f608a1 Parents: 25d0077 46b1163 Author: Shawn Feldman <sfeld...@apache.org> Authored: Fri Apr 17 14:27:11 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Fri Apr 17 14:27:11 2015 -0600 ---------------------------------------------------------------------- docs/get_2.0_running_locally.md | 165 +++++++++++++++++++++++++++++++++++ docs/index.md | 3 +- 2 files changed, 167 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
