Commit Graph

52930 Commits

Author SHA1 Message Date
Jayesh Kariya
17987d97f0 made changes to test_interfaces function. 2015-05-13 10:35:05 -06:00
Nicole Thomas
6e1c13215e Merge pull request #23634 from cachedout/issue_23629
CLI error codes on salt-key conditions
2015-05-13 09:47:58 -06:00
Nicole Thomas
2c54fb55c3 Merge pull request #23656 from arthurlogilab/patch-5
typo fix in modules/lxc.py
2015-05-13 09:26:56 -06:00
Nicole Thomas
8da26c5bed Merge pull request #23645 from cachedout/issue_23323
Read response buffer instad of httpresponse
2015-05-13 09:23:13 -06:00
Nicole Thomas
c1e8d27d2f Merge pull request #23660 from rallytime/merge-23635
Merge #23635 with some grammar fixes
2015-05-13 09:06:01 -06:00
rallytime
580ed73840 Add a couple of grammar fixes to opts docs 2015-05-13 09:04:26 -06:00
Nicole Thomas
2acf0c5a5c Merge pull request #23632 from cachedout/issue_23529
Sort keys on output with salt-key
2015-05-13 08:54:43 -06:00
Arthur Lutz
0a9a85d1b3 typo fix in modules/lxc.py 2015-05-13 15:42:59 +02:00
Mike Place
4718fb4552 Read response buffer instad of httpsresponse
Fixes #23323
2015-05-13 04:08:04 -06:00
Mike Place
7bbae942ea Lint whitespace 2015-05-13 00:48:54 -06:00
Mike Place
439ed03935 minion_mod doc 2015-05-13 00:16:49 -06:00
Mike Place
58a4a44b80 Also catch case where attempt to delete non-existent key fails 2015-05-13 00:05:53 -06:00
Mike Place
c003d49100 Deprecated flag 2015-05-13 00:03:52 -06:00
Mike Place
9f7750a118 Continuing with loader documentation 2015-05-12 23:52:45 -06:00
Mike Place
125625b787 Start to build out additional per-func docs in loader 2015-05-12 23:41:22 -06:00
Mike Place
1432077bd8 Add documentation about opts generation 2015-05-12 23:41:02 -06:00
Mike Place
90cb6d62ee Raise exit with err code if no key found
Closes #23629
2015-05-12 23:17:42 -06:00
Mike Place
fc75f709e8 Sort keys on output with salt-key
Closes #23529
2015-05-12 22:32:31 -06:00
Justin Findlay
c061bded54 Merge pull request #23625 from basepi/merge-forward-develop
Merge forward from 2015.5 to develop
2015-05-12 17:02:31 -06:00
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Thomas S Hatch
ec54da27f3 Merge pull request #23609 from kaidokert/develop
file_map: chown created directories if not root #23608
2015-05-12 15:19:04 -06:00
Kaido Kert
f246642309 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2015-05-12 09:13:52 -10:00
Kaido Kert
1718963c7b file_map: chmod created directories if not root 2015-05-12 09:11:17 -10:00
Nicole Thomas
b8589532d1 Merge pull request #23603 from rahulhan/states_winrepo_unit_test
Adding states/winrepo.py unit tests
2015-05-12 12:40:12 -06:00
Nicole Thomas
3cbbd6d277 Merge pull request #23602 from rahulhan/states_win_path_unit_test
Adding states/win_path.py unit tests
2015-05-12 12:39:37 -06:00
Nicole Thomas
3c904e8739 Merge pull request #23600 from rahulhan/states_win_network_unit_test
Adding states/win_network.py unit tests
2015-05-12 12:39:01 -06:00
Nicole Thomas
10243a7742 Merge pull request #23599 from rahulhan/states_win_firewall_unit_test
Adding win_firewall.py unit tests
2015-05-12 12:37:49 -06:00
Nicole Thomas
33b0b4a1ef Merge pull request #23596 from rallytime/merge-23584
Merge #23584 with pylint fixes and versionadded tags
2015-05-12 12:36:11 -06:00
Rahul Handay
b418404eb7 removed lint error 2015-05-12 23:06:20 +05:30
Rahul Handay
a66e7e7f1f Adding states/winrepo.py unit tests 2015-05-12 22:54:54 +05:30
Colton Myers
e73071dbdf Merge pull request #23601 from basepi/jboss.version.added
Add versionadded for jboss module/state
2015-05-12 11:22:59 -06:00
Colton Myers
0174c8fe58 Add versionadded for jboss module/state 2015-05-12 11:22:34 -06:00
Rahul Handay
122c29f71a Adding states/win_path.py unit tests 2015-05-12 22:50:02 +05:30
Rahul Handay
1be802300b Adding states/win_network.py unit tests 2015-05-12 22:45:25 +05:30
Rahul Handay
6cda890517 Adding win_firewall.py unit tests 2015-05-12 22:39:09 +05:30
Thomas S Hatch
9beb7bc529 Merge pull request #23469 from s0undt3ch/hotfix/call-the-win-func
Call the windows specific function not the general one
2015-05-12 10:47:22 -06:00
Thomas S Hatch
2ee134df4d Merge pull request #23591 from garethgreenaway/enable_disable_individual_beacons
Additions to beacons module
2015-05-12 10:42:26 -06:00
rallytime
e6faec5412 Add versionadded tags and absolute imports 2015-05-12 10:36:10 -06:00
Nicole Thomas
d2f097584c Merge pull request #23583 from jayeshka/ipset_states-unit-test
adding states/ipset unit test case
2015-05-12 10:31:55 -06:00
Nicole Thomas
82a47e8cbf Merge pull request #23582 from jayeshka/keyboard_states-unit-test
adding states/keyboard unit test case
2015-05-12 10:31:17 -06:00
Nicole Thomas
77e5b28566 Merge pull request #23581 from jayeshka/layman_states-unit-test
adding states/layman unit test case
2015-05-12 10:30:36 -06:00
Nicole Thomas
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test
adding smf unit test case
2015-05-12 10:29:58 -06:00
Nicole Thomas
d6badd3b12 Merge pull request #23577 from msciciel/develop
Fix find and remove functions to pass database param
2015-05-12 10:29:04 -06:00
Nicole Thomas
16a333832a Merge pull request #23572 from The-Loeki/ssh_auth_fix
Fix regression of #21355 introduced by #21603
2015-05-12 10:28:05 -06:00
Nicole Thomas
f843f89cd7 Merge pull request #23565 from garethgreenaway/2015_2_aptpkg_upgrade_default_to_upgrade
fix to aptpkg module
2015-05-12 10:25:46 -06:00
Gareth J. Greenaway
66b86a0ae4 adding code to allow enabling and disabling specific beacons. 2015-05-12 08:56:48 -07:00
C. R. Oldham
a46aa40899 Merge pull request #23283 from iggy/add-postgres-tablespace-support
Add support for tablespaces to postgres module & postgres_tablespace states
2015-05-12 09:32:13 -06:00
Thomas S Hatch
b6a690e780 Merge pull request #23586 from tinyclues/salt-state-file-_unify_sources_and_hashes-fix
Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes
2015-05-12 09:25:00 -06:00
Thomas S Hatch
b0620b2bde Merge pull request #23578 from YanChii/solarisips-docs
updated docs - solarisips
2015-05-12 09:22:43 -06:00
Thomas S Hatch
8d8e2df3b8 Merge pull request #23571 from bemeyert/21840-use_existing_PATH_in_cmd_env
How to still use existing $PATH in "cmd" modules
2015-05-12 09:20:31 -06:00