use postgresql CSV export to read data from the db. also adds psql_query command.
use postgresql CSV export to read data from the db. also adds psql_query command.
Merge branch 'postgres_native_csv' of github.com:geops/salt into postgres_native_csv
- adding dmesg to list of tools to that determine the virtual grains
- updated text in warning to include dmesg
Merge pull request #4356 from sijis/virtual-grains

adding dmesg to list of tools to that determine the virtual grains
Merge pull request #4349 from geops/postgres_native_csv

Use Postgresql CSV export to read data from the database
Fix changing the user shell on FreeBSD
Merge pull request #4358 from herself/hf-test

Fix changing the user shell on FreeBSD
Include traceback in some debug logging. Use `exc_info` instead of formatting the exception "by hand".
changing grain structure to support the grains.present format
find leaks function
Merge pull request #4360 from ranl/develop

tomcat module addition
Merge pull request #4359 from s0undt3ch/develop

Include traceback in some debug logging. Use `exc_info`.
Fix some logging calls which included `exc_info` on the wrong function.
Merge pull request #4363 from s0undt3ch/develop

Fix some logging calls which included `exc_info` on the wrong function.
Change puppet config dirs if Enterprise puppet
Revert "Add workaround for https://github.com/saltstack/salt-api/issues/61"

This reverts commit a42ccf1b0142ca062ce3ffdf5ad9b0a4257e1dbc.
Remove extra paren
Merge pull request #4364 from sfdc-kho/develop

Revert "Add workaround for https://github.com/saltstack/salt-api/issues/61"
Merge pull request #4365 from UtahDave/puppet_dirs

Fixes Puppet Enterprise dirs