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
37,005 Commits 24 Branches 182 Tags 341 MiB
a3707e2bab
Commit Graph

37005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
494f7f93db Merge pull request #15775 from avdhoot/develop 
fix for #15585
 2014-09-15 15:01:59 -06:00
Thomas S Hatch
5674ca84d9 Merge pull request #15688 from rominf/fish-completion 
Fish completion: add help for arguments
 2014-09-15 14:57:57 -06:00
Thomas S Hatch
bd74249d4c Merge pull request #15792 from garethgreenaway/15754 
fixes to gpg module
 2014-09-15 14:56:41 -06:00
Thomas S Hatch
bfbbf3c8e9 Merge pull request #15791 from s0undt3ch/hotfix/2014.7-properly-pass-user-to-syndic 
Properly pass user to syndic command.
 2014-09-15 14:56:17 -06:00
Thomas S Hatch
d70bb16ed9 Merge pull request #15783 from garethgreenaway/15774_2014_7 
Fixes related to to sys.argspec.
 2014-09-15 14:55:45 -06:00
Thomas S Hatch
92689e8ec1 Merge pull request #15781 from s0undt3ch/hotfix/2014.7-gce-name-regex 
Exit when the VM name does not match the allowed GCE VM names regex
 2014-09-15 14:53:48 -06:00
Thomas S Hatch
3274e4da3d Merge pull request #15780 from s0undt3ch/hotfix/2014.7-gce-fixes 
`node_data` is a libcloud Node instance which is unsubscriptable
 2014-09-15 14:53:32 -06:00
Thomas S Hatch
9ea180fde3 Merge pull request #15779 from s0undt3ch/hotfix/2014.7-filter-backports-UserWarning 
Filter the backports package UserWarning about being re-imported
 2014-09-15 14:53:04 -06:00
Pedro Algarvio
483e5bb6cd Support extra apache-libcloud>0.15 node states 2014-09-15 21:28:13 +01:00
Nicole Thomas
c73c94a060 Merge pull request #15807 from cro/yumpkg_parse_error 
Prevent stacktrace on some malformed repo lines.
 2014-09-15 14:25:18 -06:00
Mike Place
cf32d4e55b Typo 2014-09-15 14:05:24 -06:00
C. R. Oldham
4c869d57b7 Pylint 2014-09-15 13:46:45 -06:00
Mike Place
64e36c50c5 Honor __virtualname__ 
Honor the __virtualname__ directive if present and __virtual__ return
True.

Refs #14280
 2014-09-15 13:40:41 -06:00
C. R. Oldham
4d2c175e14 Fix parse error with malformed .repo files. 2014-09-15 13:23:55 -06:00
Thomas S Hatch
9f66996ba2 Merge pull request #15766 from garethgreenaway/15755 
Adding secret to the call to gpg.export_keys to export secret keys.
 2014-09-15 12:21:42 -06:00
Thomas S Hatch
b276d8bea6 Merge pull request #15765 from jacksontj/high_root 
Add localconfig to all state functions
 2014-09-15 12:20:59 -06:00
Thomas S Hatch
1e3597965f Merge pull request #15806 from thatch45/nmadhok-add-file-list_backups_dir-func 
Merge #15762
 2014-09-15 12:17:32 -06:00
Thomas S Hatch
000aef3dfe lint cleanup 2014-09-15 12:15:33 -06:00
Thomas S Hatch
3f9b69bf46 Merge branch 'add-file-list_backups_dir-func' of https://github.com/nmadhok/salt into nmadhok-add-file-list_backups_dir-func 2014-09-15 12:13:32 -06:00
Thomas S Hatch
f5294dab65 Merge pull request #15739 from nmadhok/add-test-functionality-keystone-state 
Added test functionality in all state functions within salt.states.keystone
 2014-09-15 12:10:36 -06:00
Thomas S Hatch
94ff438944 Merge pull request #15750 from jacksontj/develop 
Remove old (??) highstate cache file
 2014-09-15 12:07:59 -06:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/pip_state.py
 2014-09-15 11:49:04 -06:00
Colton Myers
4371ca3679 Merge pull request #15805 from basepi/rc2release 
Edit docs for v2014.7.0rc2 release
 2014-09-15 11:46:45 -06:00
Colton Myers
3da7fa06d9 Update release candidate docs with newest rc number 2014-09-15 11:45:56 -06:00
Colton Myers
f502159157 Update sidebar with newest release candidate 2014-09-15 11:45:47 -06:00
Thomas S Hatch
280b27d6a0 Merge pull request #15771 from garethgreenaway/15699_cron_file_newline 
Fixes to cron.py state
 2014-09-15 10:26:06 -06:00
Thomas S Hatch
5e27af51c7 Merge pull request #15701 from Jille/fix-15417 
Fixed the Result of file.replace (#15417)
 2014-09-15 10:14:42 -06:00
Nicole Thomas
4546fb0868 Merge pull request #15804 from rallytime/fix_import 
Add skipIf import to fix the 2014.7 tests
 2014-09-15 08:25:12 -06:00
rallytime
e34157c70b Add skipIf import to fix the 2014.7 tests 2014-09-15 08:23:08 -06:00
Pedro Algarvio
27dad8c53b Merge pull request #15798 from bbinet/patch-1 
fix typo in docstring
 2014-09-15 09:28:55 +01:00
Bruno Binet
48b299612f fix typo in docstring 
s/direcotry/directory/
 2014-09-15 10:18:36 +02:00
Pedro Algarvio
57b000d215 Merge pull request #15794 from s0undt3ch/hotfix/disable-problematic-vt-test 
Disable `test_issue_10404_ptys_not_released`
 2014-09-14 23:55:31 +01:00
Pedro Algarvio
a171a35c89 Disable test_issue_10404_ptys_not_released 
Disabled until we can find out why this kills the tests suite with an exit code of 134
 2014-09-14 23:54:38 +01:00
Erik Johnson
4bb8b61307 Merge pull request #15782 from s0undt3ch/hotfix/2014.7-gce-fix-format-calls 
Fix the `.format()` call indexes
 2014-09-14 17:06:15 -05:00
Gareth J. Greenaway
abc2ae93da general cleanup for function argments. Update output for gpg.verify to show when a file/text is verified or not, and when verified at what level. 2014-09-14 13:06:46 -07:00
Pedro Algarvio
ccd205b1ea Properly pass user to syndic command. 
Refs #15629 and #15608
 2014-09-14 17:44:14 +01:00
Mike Place
4b1e24efc4 Merge pull request #15778 from whiteinge/doc-salt-unity-manpage 
Added salt-unity manpages
 2014-09-14 10:16:42 -06:00
Pedro Algarvio
03e0b02724 Merge pull request #15790 from rallytime/fix_develop_tests 
Import function in syslog_ng_test so tests will run
 2014-09-14 16:14:47 +01:00
rallytime
2b3d4b8e6b Import function in syslog_ng_test so tests will run 2014-09-14 08:04:20 -06:00
Gareth J. Greenaway
604fd967e1 Fixing #15774, argspec was showing additional functions based on the module that was passed. eg. showing cmd.which and cmd.which_bin when the module cmd.which was passed. This borrows functionality from the sys.doc function for handling this situation. 2014-09-13 15:58:14 -07:00
Pedro Algarvio
a2b52c799a Fix the .format() call indexes 2014-09-13 21:18:18 +01:00
Pedro Algarvio
a35f78e40e Exit when the VM name does not match the allowed GCE VM names regex 2014-09-13 21:16:48 +01:00
Pedro Algarvio
a4153a5119 node_data is a libcloud Node instance which is unsubscriptable 2014-09-13 21:10:51 +01:00
Pedro Algarvio
311fb3c5f7 Filter the backports package UserWarning about being re-imported 2014-09-13 20:56:07 +01:00
Seth House
978931c470 Added salt-unity manpages 
Closes #13937
 2014-09-13 12:56:25 -06:00
avdhoot
3716dd1508 fix for #15585 2014-09-13 22:36:36 +05:30
Joseph Hall
901beb7c70 Merge pull request #15769 from s0undt3ch/2014.7 
Use `-oIdentityFile` instead of `-i`
 2014-09-13 07:05:28 -06:00
Roman Inflianskas
ef2b3d81b9 fish shell completion: merge 2014-09-13 14:45:20 +04:00
Roman Inflianskas
f986dee05a fish shell completion: fix remote cmd completion for cmd.run and similar 2014-09-13 14:33:53 +04:00
Gareth J. Greenaway
77ea2779b1 cron.raw_cron does not return the cron tab with a newline at the end while file.manage_file does, 
if isn't a newline already in the raw_cron output add it in.
 2014-09-12 22:16:40 -07:00