Pedro Algarvio
aec8fd67fc
Merge pull request #8041 from techhat/nova
...
Adapt server lists to be more easily used by salt-cloud
2013-10-23 04:52:52 -07:00
Joseph Hall
87e459cb55
Merge pull request #8042 from equinoxefr/update_doc_nsis
...
Adding NSIS plugin to the doc
2013-10-23 04:50:21 -07:00
EquinoxeFR
47bc1192c1
Adding NSIS plugin to the doc
2013-10-23 13:41:01 +02:00
Joseph Hall
0281728df1
Merge pull request #8036 from aboe76/develop
...
updated suse spec to salt 0.17.1
2013-10-23 04:34:38 -07:00
Joseph Hall
a3cdf7b459
Adapt server lists to be more easily used by salt-cloud
2013-10-23 05:24:02 -06:00
Joseph Hall
ac5953bd4c
Merge pull request #8037 from pyinx/patch-1
...
Update disk.py
2013-10-23 03:22:15 -07:00
Joseph Hall
0115d968df
Merge pull request #8038 from holmboe/import-fix
...
Python includes shlex
2013-10-23 03:18:23 -07:00
Henrik Holmboe
71b0a7025a
Python includes shlex
2013-10-23 11:38:41 +02:00
pyinx
8aa7e5f5f6
Update disk.py
...
add function percent
2013-10-23 14:54:12 +08:00
Niels Abspoel
c349f1cbb2
updated suse spec to salt 0.17.1
2013-10-23 07:50:21 +02:00
Thomas S Hatch
5e66b53da9
Merge pull request #8032 from basepi/daemonizewr7958
...
Fix bad file mode string, Fix #7958
2013-10-22 16:57:48 -07:00
Colton Myers
288ea5a960
Fix bad file mode string, Fix #7958
2013-10-22 16:22:41 -06:00
Thomas S Hatch
b218d6861e
fix malform from earlier pylint fix
2013-10-22 15:45:19 -06:00
Thomas S Hatch
fddeb71815
Tabs?!?!?!??!
2013-10-22 15:37:40 -06:00
Thomas S Hatch
1e59f295ef
more minor pylint fies
2013-10-22 15:31:54 -06:00
Thomas S Hatch
eedc053a38
More pylint fixes
2013-10-22 15:30:07 -06:00
Thomas S Hatch
05ffeff1df
fixes for minion.py wrt grains change per pylint
...
fyi @cachedout :)
2013-10-22 15:27:54 -06:00
Thomas S Hatch
81602ae1d1
Merge pull request #8031 from hulu/mysql-indentation
...
fix bad indentation in mysql module
2013-10-22 14:15:38 -07:00
Chris Rebert
a47691ca28
fix bad indentation in mysql module
2013-10-22 14:13:32 -07:00
Thomas S Hatch
923b68d290
Merge pull request #8025 from davidn/develop
...
Make django_orm load virtualenv packages before system packages
2013-10-22 14:12:55 -07:00
Thomas S Hatch
57842d0cbb
Merge pull request #8018 from llamallama/develop
...
Added note to docs about the need for python26-mysqldb as well as MySQL-Python for CentOS 5
2013-10-22 14:11:27 -07:00
Thomas S Hatch
87b8940a21
Merge pull request #8014 from mihait/fix_pkg_from_file
...
Pass cmd as list, not string, to subprocess.Popen.
2013-10-22 14:10:45 -07:00
Thomas S Hatch
8780a91442
Merge pull request #8029 from cachedout/mysql_grant_downgrade
...
Mysql grant downgrade
2013-10-22 14:01:07 -07:00
Colton Myers
569096d646
Merge pull request #8028 from basepi/missingsls5998
...
Throw an error rather than just logging for missing SLS, Fix #5998
2013-10-22 13:54:25 -07:00
Colton Myers
7f871f76c0
Throw an error rather than just logging for missing SLS, Fix #5998
2013-10-22 14:51:54 -06:00
Mike Place
88f2d1a091
Wrap in flag.
2013-10-22 14:51:16 -06:00
Colton Myers
1106218547
Merge pull request #8006 from cachedout/disable_lspci
...
New configuration option to disable lspci queries for GPU data on master...
2013-10-22 13:37:01 -07:00
Mike Place
cb0cac07c0
Remove spurious debugging.
2013-10-22 14:36:13 -06:00
Mike Place
81e8af08b3
Stupid typo on my part, flipped the wrong config option.
2013-10-22 14:36:13 -06:00
Mike Place
5aa4691a09
New configuration option to disable lspci queries for GPU data on master.
2013-10-22 14:36:13 -06:00
Mike Place
6c6aa70a17
Halfway through mysql downgrade
2013-10-22 14:32:23 -06:00
Colton Myers
e77f7eb985
Merge pull request #8027 from terminalmage/quickfix
...
Update RPM spec for 0.17.1
2013-10-22 13:30:10 -07:00
Erik Johnson
1a884c59f1
Update RPM spec for 0.17.1
2013-10-22 15:28:49 -05:00
David Newgas
ce26ea2dea
Make django_orm load virtualenv packages before system packages
...
A django app may require a specific version of a package that it
depends on, and will have ensured the correct version is in the
virtualenv.
This commit ensures that this version will be used, even if a
different version is installed in the system python.
See issue #8024
2013-10-22 12:22:46 -07:00
Chris Jones
541ba3155b
Removing indentation per UtahDave's correction
2013-10-22 14:26:23 -04:00
Pedro Algarvio
e36bc78767
Merge pull request #8020 from cachedout/develop
...
Catch condition in optparser where a flag like -v is passed but no targe...
2013-10-22 11:13:10 -07:00
David Boucha
8312801d28
Merge pull request #8022 from eliasp/typos
...
Corrected typos.
2013-10-22 10:54:24 -07:00
Elias Probst
e483404260
Corrected typos.
2013-10-22 19:38:31 +02:00
David Boucha
9051344424
Merge pull request #8012 from equinoxefr/upgrading_windows_installer
...
Adding close process and service stop to windows installer
2013-10-22 10:35:02 -07:00
Mike Place
83ee3b236f
Catch condition in optparser where a flag like -v is passed but no targets are passed in.
2013-10-22 11:06:13 -06:00
Chris Jones
81aedff296
Fixing formatting for mysql module docmentation.
2013-10-22 12:52:02 -04:00
Chris Jones
a8e403d48e
Added missing new line
2013-10-22 12:47:39 -04:00
Chris Jones
545d04b199
Added note to docs about the need for python26-mysqldb as well as MySQL-Python for CentOS 5
2013-10-22 12:42:24 -04:00
Tianu Mihai
e36cc4c12a
modified to a list according to Pedro Algarvio's request - fix bad brackets
2013-10-22 18:22:06 +03:00
Tianu Mihai
5438045874
modified to a list according to Pedro Algarvio's request
2013-10-22 18:16:57 +03:00
Thomas S Hatch
9f0adea1aa
Merge pull request #8002 from cachedout/mysql_grant_parser
...
Add a lexical parser for MySQL grants to the MySQL module. Change the be...
2013-10-22 06:26:19 -07:00
Thomas S Hatch
e49504e35d
hard default grains refresh to be disabled
2013-10-22 07:22:45 -06:00
Thomas S Hatch
5729eb5b90
Merge pull request #7971 from cachedout/grains_refresh_every
...
Grains refresh every
2013-10-22 06:20:29 -07:00
Thomas S Hatch
07315d0697
Merge pull request #8003 from cloudflare/fix-state-__pub_jid-keyerror
...
Generate jid in _wait in state module if not specified
2013-10-22 06:15:37 -07:00
Tianu Mihai
fa2ff25196
Pass cmd as list, not string, to subprocess.Popen. Otherwise, packages installed from files will fail with: OSError: [Errno 2] No such file or directory
2013-10-22 15:28:41 +03:00
