add retry logic for deployment scan check
Fixing up comments
Merge pull request #4793 from danmcp/master

Merged by openshift-bot
Bug 1066945 - Fixing urls
Update Contributor's Guide with more detail.
Merge pull request #4794 from danmcp/master

Merged by openshift-bot
Recalc tracked storage

Create separate op group for recalculating tracked storage

Skip unecessary usage operations when recalculating

Allow telling the trackusageop the max untracked storage amount
Merge pull request #4796 from nhr/contributors_guide_improvements

Merged by openshift-bot
Bug 1066850 - Fixing urls
Merge pull request #4800 from danmcp/master

Merged by openshift-bot
Exit if error occurs changing untracked storage
Merge pull request #4792 from bparees/deploymentscan_retry

Merged by openshift-bot
Merge pull request #4723 from liggitt/recalc_tracked_usage

Merged by openshift-bot
PHP - DocumentRoot logic (optional php/ directory)

DocumentRoot is selected based on the existence of a common public
directory in the application code in the following order:
1. php/          # for backward compatibility with OpenShift Origin v1/v2
2. public/       # Zend Framework v1/v2, Laravel, FuelPHP, Surebert etc.
3. public_html/  # Apache per-user web directories, Slim Framework etc.
4. web/          # Symfony etc.
5. www/          # Nette etc.
6. ./            # Drupal, Wordpress, CakePHP, CodeIgniter, Joomla, Kohana, PIP etc.

Add following common library directories to php include_path:
- lib/
- libs/
- libraries/
- src/
- misc/
- vendor/
- vendors/

https://trello.com/c/AK1v0o4x - origin_cartridge_card_57
fix php's openshift.conf file ownership

- upgrade existing apps
- fix cucumber test
php bin/control - move duplicated lines to pre_start_httpd_config
PHP - prevent Apache from serving internal files

- $OPENSHIFT_REPO_DIR/.openshift/
- $OPENSHIFT_REPO_DIR/deplist.txt

https://trello.com/c/AK1v0o4x - origin_cartridge_card_57
PHP - Apache DocumentRoot & Access Controls cucumber tests

https://trello.com/c/AK1v0o4x - origin_cartridge_card_57
PHP - deprecate deplist.txt in favor of .openshift/pear.txt

https://trello.com/c/XdJdVHU9 - origin_cartridge_card_138
PHP - simplify Template Directory Structure

- get rid of php/ directory
https://trello.com/c/AK1v0o4x - origin_cartridge_card_57