valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,114 Commits 24 Branches 182 Tags 341 MiB
47fef41681
Commit Graph

373 Commits

Author SHA1 Message Date
Colton Myers
8bba4bbec4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/msazure.py
	salt/modules/boto_sns.py
	salt/states/boto_sns.py
	tests/integration/modules/boto_sns.py
	tests/integration/states/boto_sns.py
 2015-01-23 14:20:34 -07:00
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
 2015-01-22 16:46:32 -07:00
Nahum Shalman
32c222f8f2 SmartOS Esky: fix build version identification 
"bdist" doesn't do the right thing in the absence of
version files produced by "sdist".
Run "sdist" then extract out the contents of the tarball
into place
 2015-01-21 20:06:48 -05:00
Roman Inflianskas
0b4f05236b [fish shell completion] updated comments 2015-01-08 15:30:29 +03:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
Roman Inflianskas
2d7e1d4809 [fish shell completion] adopt for non-interactive usage (e.g. from scripts) 2015-01-06 21:31:19 +03:00
Loren Gordon
7f7c7bd337 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:18:13 -05:00
Loren Gordon
a1d7868d64 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:02:36 -05:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Tiru Srikantha
d1192819c5 Change URL for vcredist_x64 to SP1 DL URL 
Fixes saltstack/salt#18935
 2014-12-11 14:27:32 -08:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-11-27 03:59:40 +00:00
C. R. Oldham
f41cc45a8f Switch nssm back to 32-bit 2014-11-26 13:35:53 -07:00
Niels Abspoel
3d9fa5ce1c Updated suse spec file to salt 2014.7 2014-11-19 22:48:12 +01:00
Thomas S Hatch
2be11167d6 Merge pull request #18140 from rominf/fish-completion 
fish shell completion: fix broken arguments completion
 2014-11-17 17:14:28 -07:00
Arjan de Vries
e01c27d225 Fix Silent install added option /SD to messagebox 2014-11-10 15:58:53 +01:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
C. R. Oldham
6c9be002c5 Update nssm to 2.24 2014-10-30 22:15:26 -04:00
Niels Abspoel
faaeb57759 Updated spec file to 2014.1.13 2014-10-27 22:47:30 +01:00
Erik Johnson
33a74e422e Update Fedora/RHEL spec for 2014.1.13 2014-10-17 10:46:14 -05:00
Roman Inflianskas
49fca16fb4 fish shell completion: fix broken arguments completion 2014-10-12 13:51:47 +04:00
Erik Johnson
713f3ecc73 Spelling fixes 2014-10-11 20:13:45 -05:00
Niels Abspoel
5fd3ef480f updated salt.spec file for suse: 
this fixes #16560
 2014-10-11 20:29:52 +02:00
Erik Johnson
b18ae95f84 Update RPM spec for 2014.1.11 2014-10-01 18:35:23 -05:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
David Boucha
25303c586f remove problematic expect fork 2014-09-18 10:40:05 -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
Pedro Algarvio
781092daaa Merge branch '2014.7' into develop 2014-09-11 22:42:04 +01:00
Jille Timmermans
a8e3586aa1 Some textual fixes 2014-09-11 14:45:44 +02:00
Roman Inflianskas
7b5b3f2c11 fish shell completion: add help for arguments 2014-09-11 13:10:06 +04:00
Roman Inflianskas
ecf7ddacf6 fish shell completion: move salt options to salt file 2014-09-11 13:10:06 +04:00
Nahum Shalman
adc71a4de9 SmartOS esky: build needs to invoke sdist 
per saltstack/salt#15405
 2014-09-10 16:29:13 -04:00
C. R. Oldham
06fac568bd Merge pull request #15665 from rominf/fish-completion 
fish shell completion: add remote cmd complition for cmd.run and similar
 2014-09-10 14:01:33 -06:00
Roman Inflianskas
8e19313fa9 fish shell completion: add remote cmd complition for cmd.run and similar 2014-09-10 23:56:44 +04:00
David Boucha
810d2a6d9a Merge pull request #15664 from UtahDave/2014.7fixreg 
replace version with a jinja variable
 2014-09-10 13:55:23 -06:00
David Boucha
df91a0929a replace version with a jinja variable 2014-09-10 13:52:13 -06:00
Thomas S Hatch
0004ff8898 Merge branch '2014.7' into develop 2014-09-09 11:20:29 -06:00
Nahum Shalman
aa0e7209c5 SmartOS Esky: Fix minion SMF manifest 
Some users reported an errror that SMF couldn't find auditconfig despite
the fact that the PATH is set correctly. Invoking with the full path
seems to fix the issue.
 2014-09-08 16:07:48 -04:00
Thomas S Hatch
647490b677 Merge pull request #15567 from rominf/fish-completion 
Fish completion improvements
 2014-09-06 16:33:34 -06:00
Roman Inflianskas
6b244f8326 fish shell completion: add syndic completion 2014-09-06 14:09:45 +04:00
Roman Inflianskas
83fc5374bc fish shell completion: make it possible use completions without salt-master installed 2014-09-06 14:09:20 +04:00
Thomas S Hatch
2f6ae96f37 Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
 2014-09-03 14:43:07 -06:00
Erik Johnson
cbdee403bd Add salt-api unit file symlink 2014-09-03 13:42:21 -05:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Nahum Shalman
df7736b530 SmartOS esky: fix odd problem with zeromq linking 2014-09-01 12:50:07 -04:00
Roman Inflianskas
4fc7b4b1e4 add fish shell completions for salt programs 2014-08-27 18:59:15 +04:00
Colton Myers
ad89a752f8 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/utils/cloud.py
 2014-08-25 13:29:29 -06:00
Chris Rebert
fcc41721fd sodium_grabber_installer: fix kwarg spacing 
************* Module sodium_grabber_installer
pkg/smartos/esky/sodium_grabber_installer.py:16: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    sources = [path.join(HERE, 'sodium_grabber.c')],
            ^
pkg/smartos/esky/sodium_grabber_installer.py:17: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    libraries = ['sodium'],
              ^
 2014-08-22 12:04:34 -07:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Nahum Shalman
d0dac42958 SmartOS esky build environment instructions cleanup 2014-08-21 17:37:55 -04:00