valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,543 Commits 24 Branches 182 Tags 341 MiB
95aca7aaaa
Commit Graph

55543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
babf0c7f30 Allow config item attributes to be set at the class level 2015-07-02 17:38:06 +01:00
Pedro Algarvio
237023dde0 Support Configuration as an array item 2015-07-02 17:38:06 +01:00
Pedro Algarvio
51e76c3a38 Properly handle salt.utils.config.Null 2015-07-02 17:38:06 +01:00
Pedro Algarvio
e0f4706ef6 Add array support to salt.utils.config (with unit tests) 2015-07-02 17:38:06 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Colton Myers
187268d879 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    setup.py
 2015-07-02 09:42:57 -06:00
Colton Myers
fac5c06c23 Add version number for Beryllium 2015-07-02 09:36:32 -06:00
Pedro Algarvio
f65501fff4 Merge pull request #25106 from s0undt3ch/features/raas-17-salt-cloud-ng 
Minor refactor + Unit tests for salt.utils.config + minor changes to 2 cloud drivers
 2015-07-02 11:58:34 +01:00
Daniel Jagszent
81d5d15dce add missing continue for error case 2015-07-02 12:56:48 +02:00
Pedro Algarvio
545d7e0a34 PyLint fixes 2015-07-02 10:10:25 +01:00
Pedro Algarvio
07167422ba Also test pattern 2015-07-02 10:08:08 +01:00
Justin Findlay
576f1b8493 Merge pull request #25008 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-07-01 19:04:59 -06:00
Justin Findlay
86f2791fdb Merge pull request #25114 from saltstack/revert-24798-revert-24329-postgres_database-states-unit-test 
Revert "Revert "adding states/postgres_database unit test case.""
 2015-07-01 19:01:29 -06:00
Colton Myers
52f35f761a Add import 2015-07-01 16:11:25 -06:00
Colton Myers
23c32a7518 Backport develop version of salt.fileclient.is_cached 2015-07-01 16:10:47 -06:00
Colton Myers
3c6f4a4842 Strip leading / for local file paths 2015-07-01 16:02:25 -06:00
Justin Findlay
bf8c7e7a9d Merge pull request #24362 from jayeshka/postgres_user-states-unit-test 
adding states/postgres_user unit test case.
 2015-07-01 15:45:31 -06:00
Justin Findlay
4195cea512 Merge pull request #24361 from jayeshka/postgres_schema-states-unit-test 
adding states/postgres_schema unit test case.
 2015-07-01 15:44:56 -06:00
Justin Findlay
ada8fe57d4 Merge pull request #24331 from jayeshka/postgres_extension-states-unit-test 
adding states/postgres_extension unit test case.
 2015-07-01 15:43:58 -06:00
David Boucha
9908412336 Merge pull request #25103 from UtahDave/develop 
add missing namespaced function import
 2015-07-01 14:02:42 -06:00
Justin Findlay
f0f512a4da Merge pull request #25109 from jfindlay/2015.5 
add 2015.5.3 release notes
 2015-07-01 13:45:56 -06:00
Justin Findlay
3187d5d5aa add 2015.5.3 release notes 2015-07-01 13:43:30 -06:00
Justin Anderson
21709aa483 Merge pull request #25096 from jfindlay/postgres_group_test 
Postgres group test
 2015-07-01 12:48:25 -06:00
David Boucha
0a846400c6 Merge pull request #25085 from jfindlay/fix_file 
accept all sources in the file state
 2015-07-01 12:23:45 -06:00
Justin Findlay
a98394210e Merge pull request #25095 from jfindlay/win_groupadd_test 
Win groupadd unit tests
 2015-07-01 12:18:53 -06:00
Justin Findlay
3c379dc115 declobber postgres state unit test mocking 2015-07-01 12:01:50 -06:00
Pedro Algarvio
4d4e94b59c Unit tests for salt.utils.config 2015-07-01 18:18:31 +01:00
Justin Findlay
564dffd14a depend on win libs rather than mocking them 2015-07-01 11:14:19 -06:00
Mike Place
dd80bec768 Merge pull request #25081 from gladiatr72/example-minion-config-master_type-adjustment 
replace bad value for master_type in example minion config
 2015-07-01 10:45:12 -06:00
David Boucha
df87bcf38d add missing namespaced function import 2015-07-01 10:31:15 -06:00
David Boucha
8e04944f6c Merge pull request #25102 from derBroBro/patch-1 
Update win_network.py
 2015-07-01 09:57:15 -06:00
Mike Place
36d53ef59e Merge pull request #25093 from jaybocc2/2014.7 
quick fix for issue #18447
 2015-07-01 09:56:53 -06:00
Mike Place
7c8d2a8656 Merge pull request #25089 from jfindlay/fix_sudo 
fix minion sudo
 2015-07-01 09:53:16 -06:00
Mike Place
4d6078e5dd Merge pull request #25099 from driskell/patch-1 
Fix broken batch results
 2015-07-01 09:51:29 -06:00
Justin Findlay
071ee44d41 Revert "Revert "adding states/postgres_database unit test case."" 2015-07-01 09:47:08 -06:00
Florian Ermisch
7749cc081c PEP8 W601... 2015-07-01 17:15:50 +02:00
Malte Brodersen
0310400c13 Update win_network.py 
Typo (tab) fixed.
 2015-07-01 16:46:18 +02:00
Malte Brodersen
b95c4ca091 Update win_network.py 
issue solved if dns is set to dhcp (compare to None)
 2015-07-01 16:03:30 +02:00
Florian Ermisch
bbda079fa5 fix pylint E302, E502, E713, E1305 2015-07-01 15:41:00 +02:00
Pedro Algarvio
d98d44de61 Create a thinner base class for configuration items 
In preparation for compound configuration items.
 2015-07-01 14:15:13 +01:00
Pedro Algarvio
0f831431ff Add __virtualname__ to the Cloudstack cloud driver. 2015-07-01 13:30:47 +01:00
Pedro Algarvio
a013b0fc44 Add __virtualname__ to the Alyiun cloud driver. 2015-07-01 13:30:37 +01:00
Jason Woods
59b23e5f6e Fix broken batch results 
Fixes #24875

a34b74a70c fixed the ValueError but caused results to be overwritten as if a minion did not return, when actually it did.
 2015-07-01 11:11:29 +01:00
Justin Findlay
937a252e16 remove unnecessary file state tests 2015-06-30 17:16:17 -06:00
Jay Bendon
c6a501ebda quick fix for issue #18447 2015-06-30 14:59:00 -07:00
Mike Place
9a961cc30a Merge pull request #25092 from cachedout/lint_develop 
Lint develop
 2015-06-30 15:37:07 -06:00
Mike Place
35d92ece3c Lint develop 2015-06-30 15:36:43 -06:00
Thomas S Hatch
46350796b6 Merge pull request #25083 from steverweber/fix_ipmi_stat 
ipmi: get_sensor_data would always fail
 2015-06-30 14:57:21 -06:00
Thomas S Hatch
c940dbcb03 Merge pull request #24984 from twangboy/win_user 
Win user
 2015-06-30 14:54:50 -06:00
Thomas S Hatch
15f2a4077c Merge pull request #25067 from The-Loeki/patch-1 
Fix for maxdepth=0 in find
 2015-06-30 14:54:05 -06:00