It's default_orgname, not default_org_name
Merge branch 'mm/fix-typo'
Set pooler_timeout to 2 seconds and queue max to 20
Configure pooler timeout
Changelog for queueing configuration
Default to no queueing
Merge pull request #579 from opscode/of/queueing

Of/queueing
Expose "db_timeout" for sqerl in Erchef, bifrost and mover.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #612 from opscode/kw/expose_sqerl_db_timeout

Expose "db_timeout" for sqerl in Erchef, bifrost and mover.
Provide a default value for LDAPS (port 636) when encryption is desired.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
oc_erchef 0.29.4 and oc-chef-pedant 1.0.67
Merge branch 'mp/OC-11777'
Merge pull request #613 from opscode/kw/ldaps_default_port

Provide a default value for LDAPS (port 636) when encryption is desired.
Expose "proxy_connect_timeout" for Nginx when it connects to the backends.

Also, correct CHANGELOG.md for two previous changes (minor update).

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Bump omnibus-ctl to 0.3.1
Change log for omnibus-ctl
Merge pull request #616 from opscode/of/fix_binary_logging

Bump omnibus-ctl to 0.3.1
Move `proxy_connect_timeout' to Nginx attributes.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #615 from opscode/kw/proxy_connect_timeout

Expose "proxy_connect_timeout" for Nginx when it connects to the backend...
set default ldap port to 636 only if :simple_tls is specified