52914 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Javier Domingo	63620725c3	Remove trailing whitespace	2015-05-15 13:00:11 +02:00
Javier Domingo Cansino	5cab0ecc95	ssh: AuthorizedKeysFile expands defined tokens	2015-05-15 00:45:24 +02: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
Thomas S Hatch	d30e88ce80	Merge pull request #23568 from techhat/ssh_file ... Allow Salt Cloud to use either SCP or SFTP, as configured	2015-05-12 09:20:02 -06:00
Thomas S Hatch	33eeda2a32	Merge pull request #23557 from jfindlay/update_ebuild ... use @world pkg set, add backtrack option to ebuild module	2015-05-12 09:17:31 -06:00
Thomas S Hatch	c1157cdaee	Merge pull request #23550 from jfindlay/fix_rh_ip_test ... additional mock for rh_ip_test test_build_bond	2015-05-12 09:17:16 -06:00
Thomas S Hatch	e91e229a87	Merge pull request #23549 from vr-jack/develop ... Update __init__.py	2015-05-12 09:17:02 -06:00
Thomas S Hatch	d198891b6d	Merge pull request #23527 from cedwards/ats_module ... updated trafficserver execution module to better align with upstream	2015-05-12 09:12:48 -06:00
Thomas S Hatch	d30a849943	Merge pull request #23482 from rmcleay/boto_secgroup_improvements ... Boto secgroup improvements	2015-05-12 09:12:26 -06:00
FELD Boris	ae22179e9e	Remove unused import	2015-05-12 16:25:03 +02:00
Daniel Hobley	30d8be877d	Lint fixes	2015-05-12 15:48:53 +02:00
FELD Boris	d538c8498c	Use the zip_longest from six module for python 3 compatiblity	2015-05-12 15:19:35 +02:00
FELD Boris	7907ff6a0a	Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes	2015-05-12 15:04:53 +02:00
Daniel Hobley	899ba78e79	Added power cfg module and state for windows minions ... - Allows you to set power settings on a windows minion for things like the monitor and disk	2015-05-12 14:49:48 +02:00
Jayesh Kariya	4f9719157b	adding smf unit test case	2015-05-12 18:06:49 +05:30
Jayesh Kariya	297b055b1c	adding states/layman unit test case	2015-05-12 18:05:35 +05:30
Jayesh Kariya	fa94d7ab5c	adding states/keyboard unit test case	2015-05-12 18:04:26 +05:30
Jayesh Kariya	4330cf4a6e	adding states/ipset unit test case	2015-05-12 18:03:14 +05:30
YanChii	68f1786eeb	updated documentation because solarisips is now the default module for S11+	2015-05-12 13:25:39 +02:00