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
55,381 Commits 24 Branches 182 Tags 341 MiB
3334cf604a
Commit Graph

55381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
3334cf604a Merge pull request #25184 from rallytime/bp-25126 
Back-port #25126 to 2015.8
 2015-07-06 18:57:32 -06:00
Pedro Algarvio
8aac9c92dc Merge pull request #25172 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Comment out imports while the YAML and RST rendering is not in-place.
 2015-07-06 18:25:57 +01:00
Stanislav Blokhin
3ac35a5bff Respect the test flag 2015-07-06 10:14:59 -06:00
Pedro Algarvio
b8f0eca984 Comment out imports while the YAML and RST rendering is not in-place. 2015-07-06 16:26:56 +01:00
Pedro Algarvio
e5f77bcff1 Merge pull request #25158 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Comment out not implemented code
 2015-07-06 11:45:11 +01:00
Pedro Algarvio
583a229d98 Comment out not implemented code 2015-07-06 11:44:28 +01:00
Pedro Algarvio
0cbf22d884 Merge pull request #25145 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Implement `oneOf`, `anyOf`, `allOf` and `not` with unit tests
 2015-07-03 17:56:44 +01:00
Pedro Algarvio
44738b2123 Lint fixes 2015-07-03 17:56:31 +01:00
Pedro Algarvio
f84c3e4fbd Add support for enumNames 2015-07-03 16:40:48 +01:00
Pedro Algarvio
0d9173c57e Remove repeated test 2015-07-03 16:28:57 +01:00
Pedro Algarvio
625e0b6c06 Implement oneOf, anyOf, allOf and not with unit tests 2015-07-03 16:24:46 +01:00
Pedro Algarvio
911862ea44 Merge pull request #25140 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Make the detection code work under Python 3.4
 2015-07-03 00:26:06 +01:00
Pedro Algarvio
c59d43330c Make the detection code work under Python 3.4 2015-07-02 21:08:26 +01:00
Thomas S Hatch
3922992e6b Merge pull request #25131 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Array support in salt.utils.config
 2015-07-02 13:40:34 -06:00
Justin Findlay
dfe3df0dca Merge pull request #25130 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-07-02 13:26:16 -06:00
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
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
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
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
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
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
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