Commit Graph

49370 Commits

Author SHA1 Message Date
Theodore Cowan
3c883abab9 Update fileclient.py
https://github.com/saltstack/salt/issues/21917
2015-03-25 01:08:36 -06:00
Joseph Hall
fa4c1d74ea Merge pull request #21966 from dmyerscough/21280-list-snapshots
Display all VMs with snapshots and list the names of the snapshots
2015-03-24 19:49:54 -06:00
Nicole Thomas
46e9ef246b Merge pull request #21964 from rallytime/pylint-y
Fix python 3 compatiblity for hg_pillar on develop
2015-03-24 19:27:56 -06:00
Damian Myerscough
b9f26c1a26 Display all VMs with snapshots and list the names of the snapshots 2015-03-24 16:59:03 -07:00
rallytime
cd97aab3e9 Fix python 3 compatiblity for hg_pillar on develop 2015-03-24 17:05:12 -06:00
jfindlay
96e56bfc2a Merge pull request #21959 from giannello/patch-1
Changed argument name
2015-03-24 17:01:45 -06:00
Giuseppe Iannello
b2dc598b01 Changed argument name
Renamed an argument to align to the naming convention of the render() method in all the other renderers. Incidentally fixes #21956
2015-03-24 22:56:04 +01:00
jfindlay
ecd2f70a85 Merge pull request #21951 from johntron/patch-1
Fix second `unless` example
2015-03-24 14:31:41 -06:00
jfindlay
060df316a2 Merge pull request #21950 from dmyerscough/21610-fix-stacktrace-on-ctrl-c
Gracefully stop the Salt Master
2015-03-24 14:29:32 -06:00
jfindlay
40b99a2a11 Merge pull request #21947 from dmyerscough/20625-Fixing-invalid-syntax
Ensure nginx config check passes by checking the exit status
2015-03-24 13:11:50 -06:00
jfindlay
8e4bf33404 Merge pull request #21930 from ptonelli/develop
add hg_pillar similar to git_pillar
2015-03-24 13:10:53 -06:00
John Syrinek
6558d9e6d7 Fix unless example
The second `unless` example failed to compile
2015-03-24 14:02:27 -05:00
Damian Myerscough
bb98b093bd Gracefully stop the Salt Master 2015-03-24 11:55:35 -07:00
jfindlay
0675892fa5 Merge pull request #21942 from aspyatkin/fix-pip-install-editable
Do not parse state name with pip in editable mode
2015-03-24 12:43:28 -06:00
Damian Myerscough
ac93e11a49 Ensure nginx config check passes by checking the exit status.... Nginx writes messages to stderr even when there are no errors 2015-03-24 11:09:23 -07:00
Paul Tonelli
9bf65bde80 add version annotations 2015-03-24 19:08:42 +01:00
Paul Tonelli
ab736e8f48 remove empty functions 2015-03-24 17:40:24 +01:00
Alexander Pyatkin
fdb62788de Do not parse state name with pip in editable mode 2015-03-24 16:09:38 +00:00
Paul Tonelli
15f66d1f0f fix hg_pillar unittest lint errors 2015-03-24 15:52:13 +01:00
jfindlay
56c438910a Merge pull request #21924 from luciddg/0000-virt-freemem-docs
Update virt.freemem documentation to clarify units
2015-03-23 21:02:53 -06:00
jfindlay
5b659c7999 Merge pull request #21925 from jfindlay/boto
fix tests for #21752
2015-03-23 21:01:05 -06:00
Justin Findlay
ebbb113f7a fix boto_vpc unit test and error message 2015-03-23 19:48:53 -06:00
Jason Thigpen
7fac7bbb03 Update virt.freemem documentation to clarify units 2015-03-23 18:43:05 -07:00
Thomas S Hatch
2bb4ecfe14 Merge pull request #21878 from bechtoldt/issue/21134
fix wrong file parsing in salt.modules.ssh.host_keys(), fixes #21134
2015-03-23 19:24:51 -06:00
Thomas S Hatch
e0dc59e342 Merge pull request #21877 from bechtoldt/issue/20711
Skip private keys upon ssh.host_keys execution, closes #20711
2015-03-23 19:23:36 -06:00
Thomas S Hatch
83be0d3671 Merge pull request #21853 from garethgreenaway/21810_jobs_runner
additions to list_jobs in the jobs runner
2015-03-23 19:22:47 -06:00
Thomas S Hatch
4bff51bd02 Merge pull request #21920 from fellyns/nested-output-perf
refactor nested outputter for much better performance
2015-03-23 19:19:34 -06:00
Thomas S Hatch
0c4b281b82 Merge pull request #21915 from rallytime/pylint_develop
Python 3 compat fix for states/archive_test.py
2015-03-23 19:08:46 -06:00
Thomas S Hatch
eeecdeb466 Merge pull request #21908 from ryanwohara/develop
Verify the key has a value.
2015-03-23 19:08:35 -06:00
Thomas S Hatch
2542718aeb Merge pull request #21906 from jfindlay/versions
add system info to versions report
2015-03-23 19:08:15 -06:00
Thomas S Hatch
b84ce5ad3d Merge pull request #21900 from isbm/isbm-edit-line
Feature "line edit"
2015-03-23 19:07:49 -06:00
Fellyn Silliman
57187c7e32 refactor nested outputter for much better performance, especially with large datasets 2015-03-23 18:19:53 -04:00
Nicole Thomas
c591938fa4 Merge pull request #21911 from basepi/salt-ssh.python26.20913
[Salt-SSH] Fix py3 shim changes to be python 2.6 compatible
2015-03-23 16:06:20 -06:00
rallytime
12aa7e1ff6 Python 3 compat fix for states/archive_test.py 2015-03-23 15:45:40 -06:00
Ryan W. O'Hara
af37d85f1b Remove trailing whitespace 2015-03-23 17:44:56 -04:00
Nicole Thomas
d1015f14e5 Merge pull request #21914 from saltstack/revert-21895-pylint_dev
Revert "Python 3 compat fix for pylint"
2015-03-23 15:44:00 -06:00
Nicole Thomas
8ebf146b56 Revert "Python 3 compat fix for pylint" 2015-03-23 15:43:45 -06:00
Colton Myers
24f2615459 Fix py3 shim changes to be python 2.6 compatible 2015-03-23 15:28:38 -06:00
Justin Findlay
1436d4011a add versions_report update to release notes 2015-03-23 14:02:16 -06:00
Ryan W. O'Hara
f3c8f0861c https://github.com/saltstack/salt/issues/21391 2015-03-23 15:40:49 -04:00
Justin Findlay
a4ef246c27 test.versions alias to versions_report 2015-03-23 13:28:53 -06:00
Justin Findlay
87d46e80dd add system info to versions information/report 2015-03-23 13:28:53 -06:00
Arnold Bechtoldt
92c67b71aa simply strip public and private key files, too 2015-03-23 19:43:08 +01:00
Bo Maryniuk
6e332cb5c7 Added state support for line edit 2015-03-23 18:38:41 +01:00
Bo Maryniuk
d1263b6a85 Added support for "line edit" for files 2015-03-23 18:38:28 +01:00
jfindlay
4316d61d36 Merge pull request #21895 from rallytime/pylint_dev
Python 3 compat fix for pylint
2015-03-23 11:37:05 -06:00
rallytime
7bfa4ce70d Disable unused-import for py 3 compatibility 2015-03-23 10:47:03 -06:00
Arnold Bechtoldt
8f5380bb9f fix wrong file parsing in salt.modules.ssh.host_keys(), fixes #21134, refs #20708 2015-03-23 17:20:10 +01:00
rallytime
e5e287cbb4 Pythong 3 compat fix for pylint 2015-03-23 10:03:56 -06:00
jfindlay
78640b337e Merge pull request #21891 from gotcha/patch-2
Specify valid values for gitfs_provider option
2015-03-23 09:08:01 -06:00