Commiting Rajat's fix for bug#827635
Fix for bug# 861967
Fix for bugz 862078 - Getting "ImportError: No module named
django.core.management" error on slave gears
default api version is 1.2
BugFix# 862086
fixing test typo and specifying parseconfig gem version to get rid of warnings
Merge pull request #580 from brenton/rhc-admin-move1

Merged by openshift-bot
Bug 862065 - Add some additional info to signup complete page.
Merge pull request #581 from pravisankar/dev/ravi/bug861967

Merged by openshift-bot
Merge pull request #584 from rajatchopra/master

Merged by openshift-bot
Merge pull request #587 from abhgupta/abhgupta-dev

Merged by openshift-bot
provide global flag for whether analytics is enabled
Disable analytics for admin scripts
Merge pull request #582 from ramr/master

Merged by openshift-bot
Merge pull request #586 from danmcp/master

Bug 861059
fix typos
Merge pull request #588 from smarterclayton/bug862065_additional_faq_on_signup

Merged by openshift-bot
Typeless gear changes

US 2105 Changes

Changes for US 2110 cart env namespacing

Add replacement for OPENSHIFT_GEAR_DIR.

PHP: Replace old env vars by new.(wip)

Python: Replace old env vars by new. (wip).

Perl: Replace old env vars by new (wip).

Node and DIY: Replace old vars by new (wip).

Fix sync_gears to not use OPENSHIFT_GEAR_DIR.

Abstract-httpd: Fix usage of old vars.

Fix tidy.sh to not use OPENSHIFT_GEAR_DIR and OPENSHIFT_LOG_DIR.

Remove reference to OPENSHIFT_GEAR_DIR.

Initial jboss env var refactor (WIP)

Still a little broken. Getting hangs in the cuke tests during
restart, and it's also hanging on git push during the hot
deployment tests, but the basic parts are in place.

Introduce some functions in the abstract util to support cart
namespace operations.

Fix bug in get_env_var_dynamic

Properly escape the input prior to eval to ensure
the correct results.

Change OPENSHIFT_GEAR_DIR to add CARTNS_CART_ in the name and change GEAR_CTL_SCRIPT to CARTNS_CART_CTL_SCRIPT

Update cartridge directory env vars to correct convention

Use the OPENSHIFT_{CART_NS}_CART_DIR convention for cart directory
references. With this commit, JBoss appears to be functional (at
least in the context of the Cucumber tests).

Fix function to disregard numbers

Fix to use remove version from namespace in env vars.

Environment variable namespacing for ruby-1.8 cart

Add special-casing for ruby in convert_cart_name_to_namespace_id

Fix HAProxy env vars.

Perl: Fix remaining vars.

Fix start_app and stop_app.

Fix snapshot script.

Various env var namespace fixes

Correct some issues in the JBoss carts. Do a first pass of fixes for
the Jenkins cart. Fix MySQL (although not the embedded cases). First
untested pass at PostgreSQL.

Add some more verbose output to the MCollective agent to assist in
debugging cartridge command executions.

US2111 Remove using OPENSHIFT_APP_NAME as a path segment

Refactor ruby-1.9 jenkins job template
Refactor ruby-1.8 jenkins job template
Refactor jboss abstract configure hook
Refactor python jenkins job template
Refactor php jenkins job template
Refactor perl jenkins job template
Refactor nodejs jenkins job template
Replace UPSTREAM_APP_NAME with app_type in jenkins jobs
Refactor haproxy jenkins job template
Refactor database move scripts

Env vars changed to not include application name:
  OPENSHIFT_LOG_DIR OPENSHIFT_RUN_DIR OPENSHIFT_RUNTIME_DIR OPENSHIFT_GEAR_DIR

Changing app_stop to stop instead of start

Revert start_app.sh and stop_app.sh to not use APP_HOME

Don't quote the commands to execute

Quoted commands won't execute properly.

Use new namespaced vars for _TMP_DIR in ruby-1.8

Port mongodb to new cart namespace conventions

Remove version numbers from cart env vars

Use namespaced environment variables in ruby-1.9 cart

Add utility function to get primary run dir.

Env var updates for 10gen, phpma, phpmo, rockmon

Update the cart namespace util function to not replace leading digits (e.g.
for the 10gen cart).

Clean up a few missed env var references

Takeout creation of GEAR_CTL_SCRIPT.

Remove special casing for ruby carts in convert_cart_name_to_namespace_id

Remove special-cased env vars from ruby-1.8 cart

Remove special-cased env vars from ruby-1.9 cart

Change runtime_steps to verify source tree using cart name instead of app name

Change runtime_steps to verify application logs using cart name instead of app name

Added function to get primary ctl script on a gear.

Fix admin ctl gears script.

Fix sssh.

Set cartridge_type in ruby-1.8's app_ctl_stop.sh

Fix abstract stop hook to infer cartridge_type from path

Fix abstract start/status/reload/restart hooks and abstract-httpd status hook to infer cartridge_type from path

Fixup path.

Fix misc ref to RUBY18.

Remove unnecessary versioning info from DB cart env vars

Take out standard env vars.

Remove invalid references to defunct app symlink

Hack to suppress DNS operations after every scenario

There is a global After hook registered for all cuke tests which
contacts Dynect unconditionally. Prevent this from occuring unless
there are actually DNS ops to perform. This is a short-term fix.

Fix LOG_DIR reference in action hook

Remove redundant env var creation now handled by util

deconfigure logic fixed for detecting standalone DBS - fixes rest-workflow test.

Fix conflict breakage.

Add cartridge_type assertions and automatically compute it

PHP wip for typeless.

Remove assertions, JBoss WIP

Change ruby-1.8 app_ctl_stop.sh to get instance dir using OPENSHIFT_HOME_DIR

Change ruby-1.8 app_ctl_stop.sh to get instance dir using OPENSHIFT_HOMEDIR

Removed namespaced env vars from ruby-1.8

JBoss env refactor

NodeJS env refactor

Remove namespaced environment variables from ruby-1.9

Add  as parameter to create_standard_network_env_vars in ruby-1.x

Perl env refactor

Remove namespaced env vars from python-2.6

Change python-2.6 app_ctl and deploy not to use namespaced vars

Fix postgres vars

Fix cleanup script reference

Typeless Gears: DIY 0.1

Remove deprecated environment variables

Remove deprecated env var: cron-1.4

Typeless changes for PHP, MySQL and PhpMyAdmin and changes
related to gear script removal in abstract.

Util wip.

PHP/Abstract changes.

Fix to restart hook.

Take out php ctl script.

Mysql typeless (still need to fix for standalone case and moves)

fix misc vars in php/mysql

phpmyadmin typeless.

Re-enable ns log dirs.

Conflicts:
	stickshift/abstract/abstract/info/lib/util

Typeless python with runtime tests fixed.

Typeless perl.

Take out create_standard_env_vars from perl.

Remove namespaced vars from mongodb-2.0

Fix status hook in abstract.

NodeJS typeless.

Typeless Gears: Refactor cron CTL files

Jboss env refactor

Take out OPENSHIFT_GEAR_TYPE from abstract scripts.

Remove obsolete function references

Ruby env refactor

Typeless Gears: remove diy CTL file

Refactor app_ctl.sh for ruby-1.8

Postgres env/script refactor

Mongodb typeless.

Typeless 10gen

Typeless ruby-1.8 fixes

Run dir cleanup, jenkins WIP

Typeless Jenkins

Snapshot/Restore fixes.

Add helper function to get dbs.

Typeless db fixes

Remove all calls to rm_app_dir

Fix for snapshot.sh/restore.sh

Remove references to gear_name, fix postgres deconfigure

Add health check as stepdef in runtime_url_steps.rb

HAProxy WIP.

Fix mongo version.

WIP Add dbs to scalable apps.

Snapshot/restore for DBs added to scalable apps.

Restore scaling tests (WIP, perl-5.10 fails)

Small fix to correct file check

Fix test step to correctly replace value in DIY index

Clean up type-less gear cruft

Fix for moves.

Take out GEAR_TYPE.

Take out references to CART_CTL and RUN_DIR from util.

Fix control script refs, and run them as the user

BZ859396: Fix reload script.

Fix ctl scripts to handle remote dbs.

Fixes for BZ859388

Update hook run time to 90s. jbosseap requires 68s

Namespaced environment variables

Create namespaced IP environment variables as needed
use correct database namespaced environment variables

Add process args to ps output in num_procs in command_helper.rb

Fix database deconfigure

Add translate var for migration.

Add option to command_helper.rb#num_procs to specific a label to match against command args

Add open4 dependency for ruby-1.9

Correct list of environment variables for pre-destroy

Add missing call to create namespaced network env vars.

Add missing log dir var.

Fix regression on checking for attached databases

Rename 'application is prepared for git pushes' to 'application is made publicly accessible'

Add missing step to runtime_steps.rb

Remove broken hot-deploy support for nodejs

Fix broken check for control script

Add timeout to 'when I start|stop|restart application' stepdef

Namespace PORT_PROXY.

Run cron status command in user context

Nohup node services so they survive rhchs session disconnects

Push build.sh and jenkins_job_template down to jbossas-7/jbosseap-6.0 from abstract-jboss

Fix for BZ 861343: ruby/jboss threaddump.

Don't scan the embedded directory for cart listings

This directory is obsolete, and scanning it now results in duplicate
entries. Stop scanning it and treat all cartridges uniformly when
constructing the cartridge list.

Don't write to pearrc during build

The build is executed in the context of the gear user. The pearrc
file is not writable by the gear user. The build does not modify
the PHP ini setting in the pearrc, and so there's no reason to
attempt to update pearrc to re-set this configuration item.
Attempting to do so will fail, as pearrc is not writable in this
context.

Resolve this bug: https://bugzilla.redhat.com/show_bug.cgi?id=861550

User PHP_DIR instead of GEAR_DIR

Undo changes to exclude embedded.

Don't scan the embedded directory for cart listings

This directory is obsolete, and scanning it now results in duplicate
entries. Stop scanning it and treat all cartridges uniformly when
constructing the cartridge list.

Resolve https://bugzilla.redhat.com/show_bug.cgi?id=861553
BZ853582: Prevent user from logging in while deleting gear
BZ859541: Add stickshift-node.conf as a config file (noreplace) for rubygem-stickshift-node