valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
51,265 Commits 24 Branches 182 Tags 341 MiB
e235c9759b
Commit Graph

51265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Drapeau
3bbaf2aaff Being able to deploy ssh id key to multiple hosts 
This fixes https://github.com/saltstack/salt/issues/22661
 2015-04-14 13:18:02 -04:00
Wolodja Wentland
28bb352e47 Remove broken disabled comps handling in aptpkg 
This code prevents the correct handling of disabled repositories (as discussed
in #20096) and is, on top of that, also broken in that it attempts to insert
into 'sources' while it should have inserted into 'sources.list'.

The intention of the code is unclear and removing this block results in correct
handling of disabled repositories. This commit therefore closes #20096.
 2015-04-14 18:05:10 +01:00
Wolodja Wentland
c52e9a94af Remove enabled option from pkgrepo.managed 
The 'enabled' option was highly ambiguous in that pkgrepo.managed also supports
a 'disabled' one that should be enough to express if a repository should be
enabled or disabled. It is also assumed that users who use pkgrepo.managed also
intend to use the repository later on which is why we set 'disabled' to False by
default.

This closes #22147
 2015-04-14 18:05:03 +01:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
 2015-04-14 11:03:03 -06:00
Justin Findlay
795c01d362 Merge pull request #22656 from jfindlay/bp-22624 
backport #22624 to 2014.7
 2015-04-14 10:50:33 -06:00
Thomas S Hatch
7d418be420 Merge pull request #22646 from claudiupopescu/boto_ec2_attributes 
Boto EC2 instance attributes
 2015-04-14 10:44:48 -06:00
Thomas S Hatch
0418d91175 Merge pull request #22590 from cachedout/ssh_catch_returner_exc 
Catch errors when returner unavailable in salt-ssh
 2015-04-14 10:16:05 -06:00
Michael Steed
3fa1392edc Merge pull request #22657 from rallytime/pylint_develop 
Python 3 Compat for new transport files
 2015-04-14 10:10:49 -06:00
Nicole Thomas
26420c3d7b Merge pull request #22628 from thatch45/claudiupopescu-boto_vpc_route_table_subnets 
Merge #22527
 2015-04-14 10:06:11 -06:00
Justin Findlay
bb528b6fb0 Merge pull request #22620 from kwadrat/develop 
Fix Messaging, indicate incomprehensible word
 2015-04-14 09:32:22 -06:00
Justin Findlay
9a2aca4671 Merge pull request #22643 from TimJones/fix-pkgrepo-ppa-missing-add-apt-repository 
Fix aptpkg.mod_repo returning OK even if apt-add-repository fails.
 2015-04-14 09:30:25 -06:00
rallytime
63c3ada4fd Python 3 Compat for new transport files 2015-04-14 09:16:42 -06:00
Justin Findlay
fbb89b0766 Merge pull request #22655 from ckochenower/2015.2 
Simple textual change
 2015-04-14 09:10:46 -06:00
Justin Findlay
1e747309ac Merge pull request #22648 from isbm/isbm-fsutils-fixes 
Bugfix: Report all FS types, if filter was not specified.
 2015-04-14 09:09:45 -06:00
Justin Findlay
0b65822264 Merge pull request #22647 from jayeshka/pecl-unit-test 
adding pecl unit test case.
 2015-04-14 09:09:11 -06:00
Artur Kaszuba
e4d8478eae Remove blank line 2015-04-14 09:01:44 -06:00
Corin Kochenower
60b48ce1c0 Simple textual change 2015-04-14 08:54:34 -06:00
Artur Kaszuba
0a5c345889 Fix for high cpu usage by salt-ssh 2015-04-14 08:48:13 -06:00
Justin Findlay
0795c64afa Merge pull request #22640 from jayeshka/win_dns_client-new-unit-test 
adding win_dns_client unit test case
 2015-04-14 08:46:14 -06:00
Justin Findlay
d21d360b04 Merge pull request #22642 from rahulhan/states_mdadm_unit_tests 
Adding states/mdadm.py unit test cases
 2015-04-14 08:45:55 -06:00
Justin Findlay
a7e55d6c1c Merge pull request #22641 from rahulhan/states_locale_unit_tests 
Adding states/locale.py unit test cases
 2015-04-14 08:45:24 -06:00
Justin Findlay
25fedf5e83 Merge pull request #22637 from jayeshka/saltmod-states-unit-test 
adding states/saltmod unit test case.
 2015-04-14 08:42:24 -06:00
Justin Findlay
0860843638 Merge pull request #22636 from rahulhan/states_service_unit_test 
Adding states/service.py unit test cases
 2015-04-14 08:41:28 -06:00
Justin Findlay
2fc5a0fd7b Merge pull request #22635 from BretFisher/sunos5_config_dir 
give SmartOS/sunos5 the correct CONFIG_DIR
 2015-04-14 08:39:58 -06:00
Justin Findlay
cdb65bc82f Merge pull request #22629 from ngrennan-inflection/develop 
Adding ssh_priv option in master configuration file to allow use of agent-forwarding
 2015-04-14 08:35:33 -06:00
Justin Findlay
a219be7c07 Merge pull request #22625 from rallytime/bp-22565 
Backport #22565 to 2014.7
 2015-04-14 08:13:26 -06:00
Justin Findlay
2d859a5e3d Merge pull request #22624 from rallytime/bp-22563 
Backport #22563 to 2015.2
 2015-04-14 08:12:24 -06:00
Rahul Handay
b61c3ea15e Adding states/group.py unit test cases 2015-04-14 19:12:49 +05:30
Claudiu Popescu
4efcf82e32 Fixes pylint 2015-04-14 15:06:00 +02:00
Bo Maryniuk
5d77dcefe6 Report all FS types, if filter was not specified. 2015-04-14 14:37:36 +02:00
Jayesh Kariya
1d423feeba adding pecl unit test case. 2015-04-14 17:58:15 +05:30
Jayesh Kariya
aa3a793d8f removed Mocknetwork call 2015-04-14 17:42:15 +05:30
Claudiu Popescu
b80b263607 Changed return 2015-04-14 14:07:23 +02:00
Claudiu Popescu
df917fad12 Adds support for getting and setting ec2 instace attributes 2015-04-14 13:38:49 +02:00
Mathieu Le Marec - Pasquet
b9f4cc42ae lxc: optims 2015-04-14 13:33:19 +02:00
Mathieu Le Marec - Pasquet
4821dba6cc lxc: dont use cache in exists, if not existant 
This fixes #22644
 2015-04-14 13:26:33 +02:00
Tim Jones
5099621512 Fix aptpkg.mod_repo returning OK even if apt-add-repository fails. 
Fixes #22638. aptpkg.mod_repo raises an error if apt-add-repository
returns with a non-zero exit code.
 2015-04-14 12:48:53 +02:00
Rahul Handay
8bbb9e010c Adding states/mdadm.py unit test cases 2015-04-14 16:04:26 +05:30
Rahul Handay
febc12e6b4 Adding states/locale.py unit test cases 2015-04-14 16:02:30 +05:30
Jayesh Kariya
6abe3fa0f4 adding win_dns_client unit test case 2015-04-14 15:55:11 +05:30
Jayesh Kariya
1bb4251aa1 adding win_network unit test case 2015-04-14 15:49:20 +05:30
Jayesh Kariya
0f6fbf66d7 adding states/saltmod unit test case. 2015-04-14 14:30:58 +05:30
Rahul Handay
7f73bdd523 Adding states/service.py unit test cases 2015-04-14 12:35:50 +05:30
Bret Fisher
cb36f1a50f give SmartOS/sunos5 the correct CONFIG_DIR 
Fixes #22634
 2015-04-14 01:21:48 -04:00
Mike Place
e8f521e62c Merge pull request #22632 from jacksontj/transport 
Add some support pyzmq 13.0.x
 2015-04-13 20:54:42 -06:00
Matthew Williams
709ae7eeb5 boto_*: another attempt at making lint happy 2015-04-14 01:27:45 +00:00
Matthew Williams
d42325dda2 utils.boto: tweak BotoExecutionError 2015-04-14 01:24:37 +00:00
Anthonyhawkins
421d541145 Indent and formatting issues 2015-04-13 20:14:51 -05:00
Thomas Jackson
435fc7ba61 Add some support pyzmq 13.0.x 
pyzmq 13.0.x was the first version to support *any* tornado in pyzmq, and since 14.0.x they have changed the API (IMO into a more sensible one). This conditionally changes the name to match the new API's naming
 2015-04-13 17:43:45 -07:00
Nicole Thomas
a0f0303bfd Merge pull request #22627 from jfindlay/dev_lint 
fix develop lint
 2015-04-13 18:24:38 -06:00