Merge branch 'pr/473' Conflicts: README.md docs/installation/deployment-guide.md website/lib/default.rb website/nanoc.yaml website/run.sh
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1dedb0fd Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1dedb0fd Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1dedb0fd Branch: refs/heads/asf-site Commit: 1dedb0fd7af96936ba047b502a89eb30f1bafe53 Parents: a77ec46 d4c0c83 Author: Dave Johnson <snoopd...@apache.org> Authored: Thu Feb 4 14:59:21 2016 -0800 Committer: Dave Johnson <snoopd...@apache.org> Committed: Thu Feb 4 14:59:21 2016 -0800 ---------------------------------------------------------------------- CHANGELOG | 13 ++++ README.md | 11 +--- docs/installation/deployment-guide.md | 10 --- release/README.txt | 6 +- release/binary-release.sh | 37 +++++++++++ release/pom.xml | 95 ++++++++++++++++++++++++++++ release/release-candidate.sh | 42 ++++++++----- release/release.sh | 32 ++++++---- release/src/main/assembly/binary.xml | 99 ++++++++++++++++++++++++++++++ sdks/html5-javascript/Release.md | 6 -- 10 files changed, 294 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/1dedb0fd/README.md ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/1dedb0fd/docs/installation/deployment-guide.md ---------------------------------------------------------------------- diff --cc docs/installation/deployment-guide.md index afbb636,86a7506..d865a49 --- a/docs/installation/deployment-guide.md +++ b/docs/installation/deployment-guide.md @@@ -472,13 -439,13 +472,3 @@@ Resources that might be useful to thos ## The End That's all folks. -- -- -- -- -- -- -- -- -- --