David Boucha
fe698148b6
Add missing parens that was causing an error
2012-05-11 21:24:29 -06:00
Jeff Schroeder
248b0d326d
Merge pull request #1262 from techhat/master
...
Update mount.active with better file handle, remove more expensive call
2012-05-11 07:29:45 -07:00
Jeff Schroeder
ca2afeb916
Merge pull request #1261 from jhutchins/top_warning
...
As per Clint Sabages remarks I reworked the wording
2012-05-11 07:27:40 -07:00
Jeff Schroeder
4243838c58
Merge pull request #1260 from jhutchins/choose_shell
...
More concise shell grain
2012-05-11 07:25:12 -07:00
Joseph Hall
a1cdc63072
Update mount.active with better file handle, remove more expensive system call
2012-05-11 08:14:34 -06:00
Jeff Hutchins
85ac28c1ea
More concise shell grain
...
Thanks to @SEJeff for the idea.
2012-05-11 07:28:47 -06:00
Jeff Hutchins
078472e697
As per Clint Sabages remarks I reworked the wording
2012-05-11 07:23:11 -06:00
Jeff Schroeder
b720b8e732
Merge pull request #1256 from techhat/master
...
Fill in some blanks on mount.active for extra device reporting
2012-05-11 05:46:33 -07:00
Jeff Schroeder
a97c97d217
Merge pull request #1257 from jhutchins/choose_shell
...
Use shell grain as default in modules/cmdmod.py
2012-05-11 05:31:32 -07:00
Jeff Schroeder
005a71e2e3
Merge pull request #1258 from jhutchins/top_warning
...
Add useful warning if top file can't be found.
2012-05-11 05:30:44 -07:00
Jeff Hutchins
59e0e859ec
Add useful warning if top file can't be found.
2012-05-11 01:19:49 -06:00
Jeff Hutchins
a7e97f4eb8
Use shell grain as default in modules/cmdmod.py
...
This required moving the shell grain out of the core file so that
it could be imported into cmdmod. This was required because
__grains__ isn't part of the globals when cmdmod is first called
because grains/core imports it and for this same reason a function
in core couldn't be imported into cmdmod.
2012-05-10 23:25:46 -06:00
Joseph Hall
be43d7cff9
Fill in some blanks on mount.active for extra device reporting
2012-05-10 21:15:49 -06:00
Thomas S Hatch
b281a2b3cb
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-05-10 16:15:12 -06:00
Thomas S Hatch
21b7aa9acd
Add test interface to kmod
2012-05-10 16:14:18 -06:00
Thomas S Hatch
d46162efe1
Merge pull request #1255 from Secretions/develop
...
Added "force" option to git.latest state
2012-05-10 14:57:33 -07:00
Thomas S Hatch
0e8550e282
Fix #1184
2012-05-10 15:54:54 -06:00
Joaquin Lopez
2ad049bbae
Added "force" option to git state which allows git.latest to overwrite any pre-existing data in the target directory.
2012-05-10 14:42:56 -07:00
Thomas S Hatch
2dadc6a251
Fix #1185
2012-05-10 15:35:01 -06:00
Thomas S Hatch
31dc5bbac9
Merge pull request #1254 from Talksum/initscripts
...
Initscripts
2012-05-10 14:23:04 -07:00
Thomas S Hatch
b3eecb8835
Set version to 1.0.0 pre
2012-05-10 14:55:35 -06:00
Mike Chesnut
ce3e1ca09c
changing locations of python and salt binaries to be variables in init scripts; also changing how daemon functio nis called so it uses the full path
2012-05-10 13:41:50 -07:00
Thomas S Hatch
85ef5d5082
Add initial support for dotted decs in extend
2012-05-10 14:38:24 -06:00
Mike Chesnut
9fc390ad15
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2012-05-10 13:28:43 -07:00
Thomas S Hatch
f119d3fcbb
Merge pull request #1252 from baijum/typo_django_docs
...
Fix file name typo. s/djando/django
2012-05-10 11:29:06 -07:00
Baiju Muthukadan
f0e5b30614
Fix file name typo. s/djando/django
2012-05-11 05:12:49 +05:30
Thomas S Hatch
e1a8402fa7
Merge pull request #1249 from jhutchins/choose_shell
...
Choose shell
2012-05-10 10:35:13 -07:00
Thomas S Hatch
c45427d545
Merge pull request #1246 from baijum/man_see_also
...
Add 'See also' section to man pages
2012-05-10 10:26:23 -07:00
Baiju Muthukadan
1bbb280581
Add 'See also' section to man pages
2012-05-11 03:40:39 +05:30
Thomas S Hatch
bc9b622e12
Merge pull request #1244 from therek/develop
...
Fix MAC address handling in FreeBSD
2012-05-10 10:13:22 -07:00
Jeff Hutchins
6f74470dce
Use the shell grain as the default
2012-05-10 11:12:31 -06:00
Thomas S Hatch
fc783f543d
Add kwargs to apt.upgrade
2012-05-10 11:05:15 -06:00
Thomas S Hatch
5e4fb6fed7
Merge pull request #1247 from jhutchins/1242
...
Add a no replace option for file.managed state
2012-05-10 10:00:19 -07:00
Thomas S Hatch
98f276f107
cast to a string
2012-05-10 10:57:28 -06:00
Thomas S Hatch
717672fd10
Merge pull request #1243 from jhutchins/choose_shell
...
Choose shell
2012-05-10 09:55:58 -07:00
Thomas S Hatch
24a669f0ce
Merge pull request #1241 from SEJeff/handle-sigusr1
...
Print a message to the console or /tmp when sent a SIGUSR1
2012-05-10 09:38:13 -07:00
Thomas S Hatch
e1aa31e183
Fix #1238
2012-05-10 09:49:17 -06:00
Thomas S Hatch
4d4d5248e0
Check for transparent objects in file finder, fix # 1236
2012-05-10 09:15:40 -06:00
Cezary Morga
1dff5530a1
Fixed MAC address handling in FreeBSD
2012-05-10 16:05:12 +02:00
Jeff Hutchins
7332af22a9
Add a grain to provide the shell
...
I'm not sure how this would end up working on Windows.
2012-05-10 07:51:18 -06:00
Jeff Hutchins
633e764ac2
Remove env from wait.
2012-05-10 07:29:47 -06:00
Jeff Hutchins
076feccd4e
Fix changing error into string.
2012-05-10 07:28:03 -06:00
Jeff Hutchins
8792a3364f
Add a no replace option for file.managed state
2012-05-10 00:20:18 -06:00
Jeff Hutchins
070e4c107d
Make the errors return the right way.
2012-05-09 23:55:37 -06:00
Jeff Hutchins
4d2b41ccd0
Remove redundant checking (DRY)
2012-05-09 23:55:04 -06:00
Jeff Hutchins
c58d9aedc2
Add shell checking to cmdmod since shell can be defined.
2012-05-09 23:54:08 -06:00
Jeff Hutchins
620cc3eadc
Add shell selection to cmd.run.wait
2012-05-09 23:28:19 -06:00
Jeff Schroeder
23a59c71d1
Cleaning up the publish module integration tests a bit
2012-05-09 21:42:38 -07:00
Jeff Schroeder
a561e224f2
DRY with the grains integration tests
2012-05-09 21:39:49 -07:00
Jeff Schroeder
81fbdc1249
Properly use os.path.join in some integration tests
2012-05-09 21:36:20 -07:00
