saltstack/salt — pull request #818 by dcolish (2012-03-03 05:30:08+00:00)
Title: Fix overlay of command line options in salt-key.

Ensure only one definition of default for args which also reside in master config.

I realized that command line arguments would not over lay correctly since master config values would always override. That seems backwards since the command line is generally more specific.