Todd E Johnson
aae4f16192
Change xinetd handling to be more backwards compatible.
2013-02-20 16:20:09 -06:00
Joseph Hall
34bd9891ce
Merge pull request #3810 from aboe76/suse_support_timezone.py
...
updated timezone.py with osfamily Suse issue #3807 fix
2013-02-20 13:39:30 -08:00
Niels Abspoel
3ed3113a74
updated timezone.py with osfamily Suse
...
This will fix issue #3806
2013-02-20 22:35:35 +01:00
Joseph Hall
a898e45e97
Merge pull request #3801 from UtahDave/develop
...
Fix win_service to actually query all Windows Services
2013-02-20 12:44:57 -08:00
Joseph Hall
97663a7f71
Add Jacob Albretson to the AUTHORS file
2013-02-20 18:48:19 +00:00
Colton Myers
001eb064fb
Merge pull request #3806 from s0undt3ch/develop
...
Stop the travis build deps issue
2013-02-20 10:04:20 -08:00
Colton Myers
9847f2e2bc
Add Andrew Kuhnhausen to AUTHORS
2013-02-20 10:49:36 -07:00
Pedro Algarvio
84b1a6deed
Git should already be installed.
2013-02-20 17:23:18 +00:00
Pedro Algarvio
c4e69cfc46
Ignore missing or broken packages on travis builds.
2013-02-20 17:03:14 +00:00
Colton Myers
4e7e276244
Add myself (Colton Myers) to AUTHORS
2013-02-20 09:32:42 -07:00
Colton Myers
578ae7073e
Remove Markus Gattol from AUTHORS
2013-02-20 09:32:34 -07:00
Colton Myers
7df824b607
Change Joseph's e-mail address in AUTHORS
2013-02-20 09:32:23 -07:00
David Boucha
a0d003d189
update docstring
2013-02-19 23:54:59 -07:00
David Boucha
a136c43c8b
Check for key names in case of a misspelling
2013-02-19 23:51:32 -07:00
David Boucha
e227a31425
Add query for service name from Display Name
2013-02-19 23:43:12 -07:00
David Boucha
6fcf32fbd8
Get windows services in all states
2013-02-19 22:51:50 -07:00
Thomas S Hatch
1508b356d7
Merge pull request #3796 from giantlock/develop
...
fix bugs in file.recurse state and pkg.install
2013-02-19 13:41:24 -08:00
Denis Generalov
5165b53e98
version should be always string even if yaml think it's float or int
2013-02-20 01:26:03 +04:00
Denis Generalov
ee08d2026c
fix bug in file.recurse state:
...
when include_empty=true file.recurse bring full states directory tree from master to minion
2013-02-20 01:23:07 +04:00
Thomas S Hatch
650d2f709d
Merge pull request #3795 from chideit/git-identity
...
Fix missing identity parameter in git fetch/pull
2013-02-19 13:02:03 -08:00
Samuel Cormier-Iijima
76a949fd1e
Fix missing identity parameter in git fetch/pull
2013-02-19 15:50:34 -05:00
Thomas S Hatch
ba907ad883
Merge pull request #3793 from chideit/git-identity
...
Allow specifying private key files for Git commands that use SSH
2013-02-19 12:08:24 -08:00
Samuel Cormier-Iijima
4c323c4193
Allow specifying private key files for Git commands that use SSH
2013-02-19 15:01:15 -05:00
Thomas S Hatch
2c498978f3
double verify the nbd connecti
2013-02-19 12:58:40 -07:00
Thomas S Hatch
74f90c62f6
hook seed into virt runner
2013-02-19 12:58:40 -07:00
Thomas S Hatch
109ca53c4e
Merge pull request #3792 from archtaku/issue3731
...
Fix problem with test=True for binary pkg install
2013-02-19 11:43:34 -08:00
David Boucha
f4757d9089
Update README.rst
2013-02-19 12:39:14 -07:00
Thomas S Hatch
39451c5c8a
Allow virt.init to seed vm images before starting up
2013-02-19 12:23:34 -07:00
Thomas S Hatch
9b8c6ad4b3
Merge pull request #3791 from christisking/develop
...
fixing host field syntax for salt.states.mysql_grants
2013-02-19 11:16:13 -08:00
Chris Clifton
3a3849d6d3
fixing host field syntax for salt.states.mysql_grants
2013-02-19 14:02:09 -05:00
Thomas S Hatch
897320b683
Fix soem hicups in the qemu seed
2013-02-19 11:52:53 -07:00
Thomas S Hatch
257054fe50
Add more seeding to the qemu functions
2013-02-19 11:28:19 -07:00
Erik Johnson
667036c834
Fix problem with test=True for bin pkg install
...
Thought I had fixed this in 4149529
but I was mistaken.
2013-02-19 11:58:32 -06:00
Thomas S Hatch
da9243b2dd
Merge pull request #3771 from s0undt3ch/hotfix/use-module-__all__-in-loader
...
Use `__all__` when loading modules(if provided).
2013-02-19 09:49:48 -08:00
Thomas S Hatch
5870f53ba8
Merge pull request #3787 from s0undt3ch/issues/2563
...
Re-apply 3055916b5d
correcting the copy/paste error. Refs #2563 .
2013-02-19 08:35:16 -08:00
Pedro Algarvio
41212b7deb
Some more mirror support to travis.yaml pip install calls.
2013-02-19 16:10:59 +00:00
Thomas S Hatch
c21419d0fd
Merge pull request #3786 from UtahDave/win_pkg_fixes
...
Sort packages before returning
2013-02-19 07:19:54 -08:00
Pedro Algarvio
e79e4f27f6
Besides loading module functions from __load__
we also log that information.
...
This will allow us to debug any bug reports stating that the function X is not loading(because they did not add it to an existing `__load__`).
2013-02-19 09:02:25 +00:00
Pedro Algarvio
cb662dcb47
Merge branch 'develop' of github.com:saltstack/salt into hotfix/use-module-__all__-in-loader
2013-02-19 08:42:46 +00:00
Pedro Algarvio
92da051c00
Re-apply 3055916b5d
correcting the copy/paste error. Refs #2563 .
...
We should now provide the configuration filename to load configurations from at the parser's class level.
The calls to `ConfigDirMixIn.get_config_file_path()` still accept a filename, though, if that filename is `None`(the default), it grabs the filename from the class level attribute `_config_filename_`.
2013-02-19 08:35:06 +00:00
David Boucha
bfa9efc950
Sort packages before returning
2013-02-18 21:34:56 -07:00
Thomas S Hatch
c6407e7bd5
Merge pull request #3785 from UtahDave/use_winapi-please
...
win_pkg should use pkg_resource.add_pkg
2013-02-18 19:06:21 -08:00
David Boucha
2bc84bd6b5
Don't forget function parens
2013-02-18 18:33:36 -07:00
David Boucha
19d9c9126d
proper use of add_pkg
2013-02-18 18:26:46 -07:00
Colton Myers
a2826be90c
Fix a pep8 line length issue
2013-02-18 17:48:11 -07:00
David Boucha
211997bef4
Create pkg list with pkg_resource.add_pkg
2013-02-18 17:47:26 -07:00
David Boucha
0026713d08
move dict definition outside loop
2013-02-18 17:40:50 -07:00
Thomas S Hatch
7eeacfbd69
Merge pull request #3783 from UtahDave/use_winapi-please
...
Use salt.utils.winapi.Com instead of manually running the pythoncom stuff
2013-02-18 16:39:42 -08:00
Thomas S Hatch
6865b8f0ec
Merge pull request #3784 from basepi/autherrorfix
...
Fixes #3760 Fix to properly print errors from cli.run()
2013-02-18 16:39:12 -08:00
Colton Myers
aa9327fc5a
Fix to properly print errors from cli.run()
2013-02-18 17:35:35 -07:00