Colton Myers
|
ccfcedbf6b
|
Go back to the 2015.2 version of salt.7
|
2015-04-16 11:46:30 -06:00 |
|
Colton Myers
|
8d9874a78a
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
2015-04-16 10:37:38 -06:00 |
|
Nicole Thomas
|
75348e5113
|
Merge pull request #22748 from twangboy/fix_bat
Changed %cd% to %~dp0
|
2015-04-16 10:27:31 -06:00 |
|
Nicole Thomas
|
1bb93d29af
|
Merge pull request #22660 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
|
2015-04-16 10:00:11 -06:00 |
|
salt_build
|
2d3d0b1c15
|
Changed %cd% to %~dp0
|
2015-04-16 15:07:28 +00:00 |
|
Justin Findlay
|
bacbf6cfa5
|
Merge pull request #22741 from jayeshka/lvm-states-unit-test
adding states/lvm test case
|
2015-04-16 07:20:10 -06:00 |
|
Justin Findlay
|
988ea97a0c
|
Merge pull request #22739 from rahulhan/states_network_unit_tests
Adding states/network.py unit tests
|
2015-04-16 07:19:22 -06:00 |
|
Jayesh Kariya
|
a32da0c8df
|
adding states/lvm test case
|
2015-04-16 17:09:26 +05:30 |
|
Rahul Handay
|
2a977cada7
|
Adding states/network.py unit tests
|
2015-04-16 16:19:21 +05:30 |
|
Thomas S Hatch
|
787ec88373
|
Merge pull request #22716 from twangboy/list_pkg_fix
Removed list_pkgs caching
|
2015-04-15 22:51:02 -06:00 |
|
Shane Lee
|
e1ee7db991
|
Update win_pkg.py
Fixed some lint
|
2015-04-15 22:10:02 -06:00 |
|
Colton Myers
|
f84bfdba83
|
Merge pull request #22719 from basepi/fix_minion_id_generation
Fix minion id generation
|
2015-04-15 19:26:18 -06:00 |
|
Thomas S Hatch
|
c6a3dbf65e
|
Merge pull request #22717 from ckochenower/2015.2
Eliminate a strack trace when calling jobs.list_jobs for a returner
|
2015-04-15 16:51:59 -06:00 |
|
Thomas S Hatch
|
294aa316dc
|
Merge pull request #22718 from thatch45/static_load
Add a static loader function
|
2015-04-15 16:51:31 -06:00 |
|
Colton Myers
|
134889a27a
|
Fix other instances of minion_id
|
2015-04-15 16:17:37 -06:00 |
|
Colton Myers
|
720a0fdef6
|
Rename minion_id to cache_minion_id
|
2015-04-15 14:58:42 -06:00 |
|
Nicole Thomas
|
b0602d661c
|
Merge pull request #22712 from jfindlay/state_test
fix test_sls_id unit test
|
2015-04-15 14:50:41 -06:00 |
|
Colton Myers
|
45ffa0688e
|
Fix minion_id generation
|
2015-04-15 14:46:46 -06:00 |
|
Thomas S Hatch
|
a422fa42ca
|
Add a static loader function
|
2015-04-15 14:29:25 -06:00 |
|
Corin Kochenower
|
6db2cde86d
|
Eliminate a strack trace when calling jobs.list_jobs for a returner
that returns a list of jids. Interim solution to #22713
|
2015-04-15 13:53:14 -06:00 |
|
salt_build
|
2ce35d2621
|
Removed list_pkgs caching
|
2015-04-15 19:47:30 +00:00 |
|
Justin Findlay
|
3d2221ded4
|
fix test_sls_id unit test
|
2015-04-15 12:53:50 -06:00 |
|
Justin Findlay
|
e6b6ee8ce5
|
Merge pull request #22706 from rahulhan/states_nftables_unit_tests
Adding states/nftables.py unit test cases
|
2015-04-15 10:29:23 -06:00 |
|
Justin Findlay
|
58735aaa62
|
Merge pull request #22701 from rahulhan/states_iptables_unit_tests
Adding states/iptables.py unit tests
|
2015-04-15 10:24:10 -06:00 |
|
Thomas S Hatch
|
3f800a7fd2
|
Merge pull request #22639 from jayeshka/win_network-new-unit-test
adding win_network unit test case
|
2015-04-15 09:55:54 -06:00 |
|
Thomas S Hatch
|
1fc1185d6c
|
Merge pull request #22408 from ag-wood/minion-provider
Reinstate minion config provider override as per doco
|
2015-04-15 09:40:39 -06:00 |
|
Thomas S Hatch
|
cc3e11324f
|
Merge pull request #22696 from rahulhan/state_unit_test_cases
Adding state.py unit test
|
2015-04-15 08:15:24 -06:00 |
|
Rahul Handay
|
d3e25ff4ae
|
Adding states/nftables.py unit test cases
|
2015-04-15 18:55:21 +05:30 |
|
Rahul Handay
|
e6b6c41785
|
Adding states/iptables.py unit tests
|
2015-04-15 17:15:23 +05:30 |
|
Rahul Handay
|
83aa84c2a7
|
Adding state.py unit test
|
2015-04-15 13:01:36 +05:30 |
|
Jayesh Kariya
|
4c2a3f01b5
|
used @patch for mocking.
|
2015-04-15 12:10:54 +05:30 |
|
Justin Findlay
|
3a5a60b5a7
|
Merge pull request #22688 from msteed/issue-22676
Add missing command line options to man pages
|
2015-04-14 23:17:47 -06:00 |
|
Justin Findlay
|
34526d536d
|
Merge pull request #22678 from matdrapeau/22669_fix_clustershell_host_names_prime
Fix the clustershell roster host names (CLEAN)
|
2015-04-14 23:15:10 -06:00 |
|
Thomas S Hatch
|
fb31ab4dd5
|
Merge pull request #22693 from dmyerscough/fix-keyerror-in-salt-cloud
Fixing key error
|
2015-04-14 22:06:45 -06:00 |
|
Damian Myerscough
|
f35c3bd8b6
|
Fixing key error
|
2015-04-14 19:53:16 -07:00 |
|
Michael Steed
|
70f1ca9ea5
|
Add missing command line options to man pages
Refs #22676
|
2015-04-14 17:32:56 -06:00 |
|
Colton Myers
|
f1ba391624
|
Trailing slash
|
2015-04-14 17:23:06 -06:00 |
|
Nicole Thomas
|
23a9d77fd2
|
Merge pull request #22674 from jacobhammons/2014.7
Regenerated salt-call and salt.7 man pages
|
2015-04-14 15:42:44 -06:00 |
|
Mathieu Drapeau
|
56a0ea97d3
|
Fix the clustershell roster host names (CLEAN)
This fixes: https://github.com/saltstack/salt/issues/22669
This closes: https://github.com/saltstack/salt/pull/22670
|
2015-04-14 17:14:44 -04:00 |
|
Colton Myers
|
cc3dca78d3
|
Move the pylint ignore to catch all relevant imports
|
2015-04-14 15:13:31 -06:00 |
|
Thomas S Hatch
|
2d6fcf0190
|
Merge pull request #22612 from cachedout/issue_17189
Avoid minion-specific messages on master start
|
2015-04-14 14:15:35 -06:00 |
|
Erik Johnson
|
9b275814f0
|
Merge pull request #22645 from makinacorpus/lxcache
lxc: dont use cache in exists, if not existant
|
2015-04-14 15:07:29 -05:00 |
|
Thomas S Hatch
|
9c7a8a8145
|
Merge pull request #22664 from rallytime/bp-22635
Backport #22635 to 2015.2
|
2015-04-14 14:07:21 -06:00 |
|
Thomas S Hatch
|
781e5908f6
|
Merge pull request #22662 from matdrapeau/22661_deploy_id_to_multiple_hosts
Being able to deploy ssh id key to multiple hosts
|
2015-04-14 14:07:12 -06:00 |
|
Jacob Hammons
|
6e416fc300
|
Regenerated salt-call and salt.7 man pages Refs #22239
|
2015-04-14 13:56:31 -06:00 |
|
Nicole Thomas
|
c0d1bdd60b
|
Merge pull request #22666 from msteed/issue_22239
Update salt-call manpage to match cli help text
|
2015-04-14 13:24:03 -06:00 |
|
Colton Myers
|
e0c212866b
|
Missing trailing underscore for test
|
2015-04-14 12:59:27 -06:00 |
|
Colton Myers
|
a02ced40f0
|
Lint
|
2015-04-14 12:57:25 -06:00 |
|
Colton Myers
|
a035402695
|
Use six.move.configparser instead of salt._compat
|
2015-04-14 12:56:35 -06:00 |
|
Nicole Thomas
|
edeec678d4
|
Merge pull request #22623 from thatch45/merge_22115
merge 22115 in correct branch
|
2015-04-14 12:47:20 -06:00 |
|