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
Nahum Shalman
cdae8948a1
SmartOS esky packaging of 2014.7
...
Resulting builds can be used either with zeromq or with raet
2014-08-21 16:01:46 -04:00
Chris Rebert
baa4f852df
fix typo: Feauture => Feature
2014-08-11 11:00:23 -07:00
Erik Johnson
17049624ea
Fix incorrect conditional in spec
2014-08-10 12:20:30 -05:00
Thomas S Hatch
e311dae191
Merge pull request #14761 from terminalmage/update-spec
...
Update RPM spec for 2014.1.10
2014-08-08 15:57:43 -06:00
Thomas S Hatch
616e61f663
Merge pull request #14742 from steverweber/fix_stuff
...
catch exceptions and fix some vars
2014-08-06 11:58:00 -06:00
Erik Johnson
5f9931636a
Deploy /var/cache/salt with common RPM
...
Also changed the deprecated $RPM_BUILD_ROOT to %{buildroot}.
2014-08-05 22:15:34 -05:00
steve
bc3ade860c
catch exceptions and fix some vars
2014-08-05 22:39:57 -04:00
Erik Johnson
670e315c19
Update RPM spec for 2014.1.10
2014-08-05 17:02:35 -05:00
Colton Myers
13995afba0
Merge branch '2014.7' into develop
...
Conflicts:
doc/topics/releases/2014.7.0.rst
2014-08-05 15:32:04 -06:00
Nahum Shalman
7a0044a8f5
SmartOS Esky: py27-mysqldb in build environment
...
Requested by @johngrasty
2014-08-04 16:15:17 -04:00
Niels Abspoel
d9bfda2dcd
This fixes two issues #14337 and #13788
...
use-forking-daemon.patch -> #14337
the other patchesr are for #13788
With thanks to Tim Serong who created the patches.
2014-07-29 20:34:12 +02:00
Elias Probst
43589f380d
Drop outdated ebuilds. Maintained now by Gentoo in app-admin/salt
2014-07-23 10:52:11 +02:00
Seth House
95f31c591d
Fix 'stop' for RedHat salt-api init script
2014-07-21 20:46:26 -06:00
Thomas S Hatch
63ea2267cd
Merge pull request #14216 from cro/portfile
...
Update MacPorts Portfile
2014-07-14 17:14:37 -06:00
C. R. Oldham
3f0b561cb4
Next iteration of the Portfile
2014-07-14 15:36:11 -06:00
C. R. Oldham
a1d7e44d84
Use plists in "pkg/darwin" instead
2014-07-14 12:26:38 -06:00
Khris Richardson
1acd82f3f1
add sphinx spelling extension. enforce en_us
2014-07-13 13:43:33 -05:00
David Boucha
ea12719881
bump windows installer version
2014-07-12 23:18:58 -06:00
Niels Abspoel
5b451d7e2d
updated suse spec file for 2014.1.7
2014-07-11 19:50:06 +02:00
Erik Johnson
1197a06716
Update spec for 2014.1.7
2014-07-10 20:52:00 -06:00
C. R. Oldham
88c2fd3872
Portfile and .plist files for MacPorts
2014-07-10 11:20:26 -06:00
Thomas S Hatch
779aa72367
Merge pull request #14070 from nshalman/requirements
...
SmartOS esky build: requirements files
2014-07-09 21:23:23 -06:00