Henrik Holmboe
218b842068
I always have to look up these :)
2013-10-23 17:05:56 +02:00
Joseph Hall
05901fc288
Merge pull request #8046 from holmboe/issue-8043
...
Add enc, comment and options for ssh_auth.absent
2013-10-23 07:59:15 -07:00
regilero
3db62ebc3f
Add file.blockreplace module and state. With unit tests.
2013-10-23 16:36:59 +02:00
Henrik Holmboe
700daabe87
More copyedit
2013-10-23 15:44:35 +02:00
Henrik Holmboe
33dfd7f529
Argument documentation
...
And some copyedit.
2013-10-23 15:42:42 +02:00
Henrik Holmboe
8c23a200fa
Add enc, comment and options for ssh_auth.absent
...
These are present for ssh_auth.present, but not for ssh_auth.absent.
This poses a problem further into the code in ssh.check_key (or rather
_refine_enc() in the ssh module) when it is validating the encryption
type.
Fixes #8043 .
2013-10-23 15:23:50 +02:00
Joseph Hall
521ccda5a2
Merge pull request #8045 from holmboe/minor-fixups
...
Minor fixups
2013-10-23 06:09:25 -07:00
Henrik Holmboe
d59e0a0f3e
Use list.insert
2013-10-23 15:04:22 +02:00
Henrik Holmboe
f2f49d5bb6
Whitespace and single quotes
2013-10-23 15:03:56 +02:00
Joseph Hall
2263ef3850
Merge pull request #8044 from holmboe/regexp-changes
...
Fix regexes
2013-10-23 05:51:41 -07:00
Henrik Holmboe
4557029de2
Fix regexes
...
- net.py: A MAC address can be separated using periods
- manage.py: Use regex range
2013-10-23 14:38:17 +02:00
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
cmartyniuk
c00cf31c54
Added detection for upstart on Debian/Raspbian distros
...
Upstart is detected by calling 'initctl version' and checking for 'upstart' in the return string, as is done in /lib/lsb/init-functions
2013-10-23 07:26:39 -03: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
Forrest Alvarez
b64dc90a20
updated hacking (developing) tutorial with information on running a simplye python http server to show changes that you have made.
2013-10-23 05:23:24 +00:00
Forrest Alvarez
5039727898
initial add of the halite docs, still need a lot of work.
2013-10-23 04:51:52 +00:00
Forrest Alvarez
e164562c90
Merge remote branch 'upstream/develop' into develop
2013-10-23 04:48:17 +00:00
Mike Place
381ca634e9
Non-minified version of modernizr-2.6.2-respond-1.1.0.min.js. Refs #7748 .
2013-10-22 20:07:58 -06: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
