valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,580 Commits 24 Branches 182 Tags 341 MiB
4066cf379c
Commit Graph

55580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
8f91da6d6c Merge pull request #25135 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-07-02 13:43:02 -06: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
Thomas S Hatch
7207f76f97 Merge pull request #25128 from stanislavb/archive 
Use cmd_unzip to preserve permissions
 2015-07-02 13:39:36 -06:00
Thomas S Hatch
1d5cfde876 Merge pull request #25126 from stanislavb/develop 
dockerio states respect the test flag
 2015-07-02 13:39:24 -06:00
Thomas S Hatch
a723af0f10 Merge pull request #25120 from d--j/patch-2 
add missing continue for exeption case
 2015-07-02 13:38:45 -06:00
Thomas S Hatch
6e2222241a Merge pull request #25117 from basepi/fix.fileclient.is_cached 
Fix fileclient.is_cached
 2015-07-02 13:38:26 -06:00
Thomas S Hatch
03abf8bd33 Merge pull request #25116 from nmadhok/file-replace-count-patch 
Fixing issue where count was being ignored by file.replace
 2015-07-02 13:37:18 -06:00
Thomas S Hatch
78a8979818 Merge pull request #25100 from tankywoo/revert-24625-file-directory-clean-performance 
Revert "remove unneeded os.walk require directory"
 2015-07-02 13:36:42 -06:00
Thomas S Hatch
c80990ba4f Merge pull request #25087 from 0xf10e/fix_glance_2015.5 
Fix execution module for glance - now based on 2015.5!
 2015-07-02 13:36:27 -06:00
Thomas S Hatch
756735f56b Merge pull request #25084 from ashangit/develop 
Ensure object is type basestring and not only string for gpg render
 2015-07-02 13:35:56 -06:00
Thomas S Hatch
ed2f7ba069 Merge pull request #25004 from garethgreenaway/pkg_beacon 
Adding a beacon to monitor installed packages
 2015-07-02 13:35:31 -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
Colton Myers
38e243fdfb Add fix from merge forward 2015-07-02 11:39:49 -06:00
Colton Myers
549ee47420 Merge pull request #25129 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-07-02 11:37:40 -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
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
Stanislav Blokhin
518cb8e403 Use cmd_unzip to preserve permissions 2015-07-02 16:45:31 +02:00
Stanislav Blokhin
a2488e6ca8 Respect the test flag 2015-07-02 15:23:46 +02:00
Arthur Lutz
8b7896e005 version added docstring 2015-07-02 14:23:40 +02:00
Arthur Lutz
8505bd0b1a [auth] add sharedsecret auth (closes #25121) 2015-07-02 14:13:43 +02:00
Bo Maryniuk
9c5aaac185 Initial implementation of the state 2015-07-02 13:27:04 +02: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
Nitin Madhok
45477121f2 safe to check for less than than not equal 2015-07-01 19:51:32 -04: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
Nitin Madhok
28a38518f0 Fixing issue where count was being ignored by file.replace Fixes #25112 2015-07-01 18:09:27 -04:00
Colton Myers
3c6f4a4842 Strip leading / for local file paths 2015-07-01 16:02:25 -06:00
System Administrator
85419a4e15 Merge branch 'add-gem-source-server' of https://github.com/ashangit/salt into add-gem-source-server 
Add source option to gem state
 2015-07-01 23:53:42 +02:00
System Administrator
5f9082838d Add source option to gem state 2015-07-01 23:51:37 +02:00
System Administrator
864d6dcbbc Add gem source server option 2015-07-01 23:51:37 +02: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
nfraison
7ddfb87a1c Move from basestring to six.string_types which is compatible with python 2 and 3 2015-07-01 23:14:28 +02: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
Tanky Woo
7e84d3db80 Revert "remove unneeded os.walk require directory" 2015-07-02 02:23:13 +08:00