Commit Graph

14564 Commits

Author SHA1 Message Date
Pedro Algarvio
b0d9cf18c2 Added support for __main__ execution and formatting fixes. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
663f54ef9f Update copyright years of changed files. Added __main__ execution to tests/integration/states/pip.py. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
0a9f157262 Update sys.path before import salt. This way salt does not need to be installed. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
ef342a5173 Install Salt Testing from git 2013-06-28 00:12:57 +01:00
Pedro Algarvio
222be7b446 Make sure every test module is runnable by __main__.
* Double to single quotes
2013-06-28 00:12:56 +01:00
Pedro Algarvio
be54a503d9 Adapted code fix sys.path in case called from __main__. Adapted to salt-testing. 2013-06-28 00:12:56 +01:00
Pedro Algarvio
860f74847e Remove the now unnecessary saltunittest. Moved remaining functionality to integration. 2013-06-28 00:12:56 +01:00
Pedro Algarvio
d4fd1baa2f Adapted the tests suite to work with salt-testing 2013-06-28 00:12:56 +01:00
Thomas S Hatch
e07375db4e Merge pull request #5794 from basepi/unicode5776
Add additional debug logic for reading templating files
2013-06-27 16:04:00 -07:00
David Boucha
b9d0352e99 Merge pull request #5796 from s0undt3ch/hotfix/modules.sysmod
Fix travis and sys.list_functions
2013-06-27 16:01:51 -07:00
Pedro Algarvio
d66683ac13 Allow for all documentation to be returned. 2013-06-27 23:31:33 +01:00
David Boucha
dc7085ac65 Merge pull request #5797 from cgoudie/patch-1
Update network.py
2013-06-27 15:24:59 -07:00
Pedro Algarvio
576a5a4b78 Some more sysmod testing improvements. 2013-06-27 23:15:36 +01:00
cgoudie
332f4d8714 Update network.py
refresh instead of reload
2013-06-27 16:14:35 -06:00
Pedro Algarvio
276858d619 Improve sys.list_functions tests. 2013-06-27 23:00:55 +01:00
Pedro Algarvio
d5cf7218a4 Allow all functions to be returned. Refs #5779. 2013-06-27 22:55:13 +01:00
Colton Myers
b1d1f77e09 Make the except less general 2013-06-27 15:45:37 -06:00
Thomas S Hatch
4a6408fb4c Merge pull request #5792 from basepi/envdoc5772
Document the `env` arg for cmdmod functions, Fix #5772
2013-06-27 14:42:32 -07:00
Thomas S Hatch
4a6549cd70 Trigger the controlling minion process to refresh grains also 2013-06-27 15:36:08 -06:00
Thomas S Hatch
30c6aa3575 Merge pull request #5789 from jhutchins/patch-2
Update network.py
2013-06-27 14:39:34 -07:00
Colton Myers
0540c13ffa Add additional debug logic for reading templating files
Ref #5776
2013-06-27 15:03:28 -06:00
Colton Myers
2ed7291003 Document the env arg for cmdmod functions, Fix #5772 2013-06-27 14:54:09 -06:00
Joseph Hall
5a2f551479 Merge pull request #5790 from jhutchins/patch-3
Update AUTHORS
2013-06-27 13:39:18 -07:00
Jeff Hutchins
30f2fcb7ee Update AUTHORS
I contribute.
2013-06-27 14:33:46 -06:00
Jeff Hutchins
cf962ae44a Update network.py
Update data as required due to network interface changes. Thanks to help from @cgoudie.
2013-06-27 14:29:44 -06:00
Joseph Hall
d393134498 Merge pull request #5788 from terminalmage/issue5779
Fix traceback in sys.doc, sys.list_functions
2013-06-27 11:48:44 -07:00
Erik Johnson
45669c0b15 Fix traceback in sys.doc, sys.list_functions
This fixes #5779. In addition, it adds support for an arbitrary number
of positional arguments.
2013-06-27 13:38:06 -05:00
Joseph Hall
ab16cbb688 Merge pull request #5783 from pille/kmod-is_loaded
add kmod.is_loaded to check if a kernel module is currently loaded.
2013-06-27 10:52:47 -07:00
pille
c6812f9064 add kmod.is_loaded to check if a kernel module is currently loaded.
this
  if salt['kmod.is_loaded']('aacraid')

now obsoletes my workaround:
  if salt['cmd.retcode']('lsmod |grep ^aacraid') == 0

in sls files
2013-06-27 19:40:36 +02:00
Thomas S Hatch
cfa02cc695 clean up docstring 2013-06-27 11:28:08 -06:00
Thomas S Hatch
bef4f7e01e Add thin setup.py 2013-06-27 11:19:06 -06:00
Thomas S Hatch
c534992bf0 Add requirements for salt-thin 2013-06-27 11:19:06 -06:00
Thomas S Hatch
a15358d7e3 Add manifest for salt-thin 2013-06-27 11:19:06 -06:00
Colton Myers
045b554958 Merge pull request #5781 from terminalmage/quickfix
Revert 439c736, 29798a8
2013-06-27 09:51:25 -07:00
Erik Johnson
65e1f5e838 Revert 439c736, 29798a8
This puts back the call to __gen_rtag(). Its removal was a
misunderstanding of how the rtag works. mod_init creates the file,
__gen_rtag() just returns the path to the file so that it can be checked
to see if the file exists.
2013-06-27 11:44:47 -05:00
Joseph Hall
633362811c Merge pull request #5777 from bretep/develop
Fix documentation for network routes
2013-06-27 08:05:33 -07:00
Bret Palsson
e4c14fe308 Fix documentation 2013-06-27 08:37:27 -06:00
Joseph Hall
e4edd1dcef Merge pull request #5774 from s0undt3ch/issues/5773
Correct CLI example. Fixes #5773.
2013-06-27 05:28:27 -07:00
Pedro Algarvio
2c6161b6ff Correct CLI example. Fixes #5773. 2013-06-27 13:10:34 +01:00
Colton Myers
450493b8c1 Merge pull request #5766 from terminalmage/release_notes
Add BSD shadow support to release notes.
2013-06-26 15:13:47 -07:00
Erik Johnson
f8ae107446 Add BSD shadow support to release notes.
Also added a versionchanged directive to the docstring for the user
state to denote when shadow support was added for BSD.
2013-06-26 17:10:56 -05:00
Colton Myers
8e9908f95f Merge pull request #5765 from terminalmage/bsd_shadow
Add shadow support for OpenBSD
2013-06-26 14:59:50 -07:00
Erik Johnson
1ea52a076c Add note to docstring reflecting OpenBSD shadow support 2013-06-26 16:58:29 -05:00
Erik Johnson
7acc8872a2 docstring tweak 2013-06-26 16:46:33 -05:00
Erik Johnson
6d83e6d48b Add OpenBSD to the list of OSes which support password hashes 2013-06-26 16:41:39 -05:00
Erik Johnson
d3bf3f7ded Consolidate BSD shadow support into single module
Since OpenBSD works the same way as NetBSD, instead of writing a third
module this commit consolidates BSD shadow operations into a single
module.
2013-06-26 16:40:38 -05:00
Joseph Hall
53552b6f7a Merge pull request #5764 from basepi/directory5741
Type-check recurse to prevent traceback, Fix #5741
2013-06-26 14:40:32 -07:00
Thomas S Hatch
7bd41a9f2c Finish code of ssh trans back end, ready to hook in and validate! 2013-06-26 15:32:36 -06:00
Colton Myers
2772ac4de8 Type-check recurse to prevent traceback, Fix #5741 2013-06-26 15:31:16 -06:00
Thomas S Hatch
e3e73beecf Merge pull request #5749 from s0undt3ch/develop
Now that #5744 is merged, apply the same recipe to `SaltRunOptionParser`
2013-06-26 14:15:55 -07:00