valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
54,961 Commits 24 Branches 182 Tags 341 MiB
0ea5f76342
Commit Graph

54961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Kuzmenko
954ba6eba9 Fixed GET /jobs/<id> requests 2015-06-19 18:42:56 +03:00
Mike Place
6fcff4d388 Merge pull request #24794 from alprs/feature-pillar_keys 
Add module function "pillar.keys"
 2015-06-19 09:24:02 -06:00
Mike Place
4c5a708599 Merge pull request #24809 from jodv/single_item_master_list 
Correctly create single item list for failover master type with string value for master opt
 2015-06-19 09:22:20 -06:00
Justin Findlay
df74df3922 Merge pull request #24360 from dr4Ke/unit_tests_state_grains_develop 
more complete unit tests for state grains
 2015-06-19 09:10:08 -06:00
Peter Nyilas
02683f544e Fix password parsing in ssh sessions 2015-06-19 11:50:58 +01:00
Christophe Drevet-Droguet
ed4d0646a4 unit tests for state grains: use a subdirectory for config file 
This way, there is no /tmp/grains created on test execution. And the issue
with test_absent_delete is always triggered.
Maybe we should use mocked files, but I'm not sure how to do it.
 2015-06-19 12:49:48 +02:00
Christophe Drevet-Droguet
4d1810bf4e fix weird error in test test_absent_delete 
In the function grains.setvals, when deleting a key (destructive=True),
the __grains__ var, containing the current grains was updated only if
the grains file actually contained the key. In this test, it was not the
case because the grains file is not actually used, but the current grains
var was set manually.
 2015-06-19 12:49:47 +02:00
Christophe Drevet-Droguet
ff5267b1b6 trying to fix jenkins error 
There are many jenkins errors on linode CentOS7. The function `saltutil.sync_grains`
does not seem to be mocked correctly on this platform.

Based on 1f5836d0bb
 2015-06-19 12:49:28 +02:00
Jayesh Kariya
98831a8cb0 adding states/splunk_search unit test case. 2015-06-19 15:15:49 +05:30
Christophe Drevet-Droguet
650fa90b97 more complete unit tests for state grains 2015-06-19 09:20:23 +02:00
rallytime
4a0626bf27 Python 3 compat fix 2015-06-18 18:42:04 -06:00
rallytime
5c137c86ad Make the GoGrid Cloud Provider Tests work 2015-06-18 17:08:57 -06:00
rallytime
5c5dfc557b More aws --> ec2 references 2015-06-18 16:12:13 -06:00
rallytime
4de5afbe53 Replace references to aws with ec2 2015-06-18 16:06:57 -06:00
Joseph Hall
0245ea1b58 Merge pull request #24811 from rallytime/gogrid_map_warning 
Add notes to map and gogrid docs -- don't use -P with map files
 2015-06-18 14:58:50 -06:00
rallytime
61de27a075 Bah! Fix more whitespace. 2015-06-18 14:46:25 -06:00
Mike Place
d2fff57d5c Merge pull request #24812 from cachedout/win_status_lint 
Lint win_status
 2015-06-18 14:29:41 -06:00
Mike Place
f3b06081fc Lint win_status 2015-06-18 14:29:19 -06:00
rallytime
d045fb579e Add notes to map and gogrid docs -- don't use -P with map files 2015-06-18 14:25:20 -06:00
Colton Myers
da8b637d4d Merge pull request #24804 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-18 14:12:01 -06:00
Colton Myers
ae05e70e94 Merge pull request #24802 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-06-18 14:11:58 -06:00
rallytime
1e85bb9792 Fix bugs caught by tests, and clean up some of the tests 2015-06-18 14:02:13 -06:00
Colton Myers
5b7a65d6d9 Merge pull request #19 from twangboy/merge-forward-fixes 
Fixed test failures for Colton
 2015-06-18 13:02:26 -06:00
twangboy
98e7e90299 Fixed test failures for Colton 2015-06-18 12:58:18 -06:00
Colton Myers
e707193055 Lint 2015-06-18 12:41:55 -06:00
Jeremy Rosenbaum
18ceebc77f single item list vs. list of characters 2015-06-18 11:30:01 -07:00
Mike Place
b93fa83a72 Merge pull request #24808 from cachedout/lint_state 
Fix lint in state.py
 2015-06-18 12:13:06 -06:00
Mike Place
92a61ff79c Fix lint in state.py 2015-06-18 12:11:49 -06:00
Mike Place
bf0fe4ea2e Merge pull request #24807 from cachedout/skip_enc 
Skip encoding tests if unsupported
 2015-06-18 12:09:28 -06:00
Mike Place
558ce63b31 Skip encoding tests if unsupported 2015-06-18 12:06:10 -06:00
Justin Findlay
daa76c34e4 Merge pull request #24798 from saltstack/revert-24329-postgres_database-states-unit-test 
Revert "adding states/postgres_database unit test case."
 2015-06-18 11:56:16 -06:00
Mike Place
0da049b6ae Merge pull request #24806 from cachedout/better_payload_logging 
Improved debugging for missing or corrupt payloads
 2015-06-18 11:53:15 -06:00
Mike Place
e7d8e23d9e Improved debugging for missing or corrupt payloads 2015-06-18 11:52:30 -06:00
Mike Place
07b6a2bffd Merge pull request #24805 from cachedout/test_zmq_wait 
Fix failing zmq tests
 2015-06-18 11:46:39 -06:00
Mike Place
72752f53ff Fix failing zmq tests 
This is just a stopgap to prevent the ioloop from shutting down before the procs die off.
 2015-06-18 11:45:57 -06:00
Mike Place
7073a9f850 Merge pull request #24791 from rallytime/bp-24749 
Back-port #24749 to 2015.5
 2015-06-18 11:43:15 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
Colton Myers
b949856ae6 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-18 11:37:17 -06:00
rallytime
6d57ceba9e Whitespace fix 2015-06-18 10:52:09 -06:00
Justin Anderson
179ce03d93 Revert "adding states/postgres_database unit test case." 2015-06-18 10:24:11 -06:00
rallytime
404268286a Add provider --> driver change to release notes 2015-06-18 10:14:02 -06:00
C. R. Oldham
1a158e8a3b Merge pull request #24792 from rallytime/bp-24757 
Back-port #24757 to 2015.5
 2015-06-18 09:58:35 -06:00
Andreas Lutro
db229d1125 Add module function "pillar.keys" 
Closes #24787
 2015-06-18 17:40:43 +02:00
C. R. Oldham
0f9298263b Merge pull request #24768 from jfindlay/pkg_mod 
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
 2015-06-18 09:13:12 -06:00
Mike Place
6c804f0789 Fix loader call in pyobjects 2015-06-18 09:11:45 -06:00
Oliver Bestwalter
be43b2b394 add windows specfic default for multiprocessing 
multiprocessing has to be set to false on windows and should be done automatically like it is done with ipc_mode
 2015-06-18 09:08:18 -06:00
Cameron Norman
a54245f080 Add missing import 2015-06-18 09:04:14 -06:00
Cameron Norman
4ce6370d6e salt.modules.upstart: fix lint errors 2015-06-18 09:04:14 -06:00
Cameron Norman
aec53ec32a Improve Upstart enable/disable handling 
* Properly search for manual stanza instead of just override
* Handle "manual" stanzas in both override and regular conf files
* Do not try to disable/enable already enabled services
* Do not overwrite override files (use append) on disable
* Only delete empty override files on enable
 2015-06-18 09:04:14 -06:00
Gunnlaugur Þór Briem
95ac4eba13 virtualenv.managed: document user and no_chown 
gh-24716
 2015-06-18 09:03:00 -06:00