Thomas S Hatch
0cc12b318d
Merge pull request #2695 from BackSeat/develop
...
Rework Linux and FreeBSD insatllation pages
2012-11-25 19:41:51 -08:00
Thomas S Hatch
b71a61b9e9
Merge pull request #2694 from s0undt3ch/develop
...
`fcntl` is not available on windows.
2012-11-25 19:35:20 -08:00
Thomas S Hatch
6230ce32f8
Merge pull request #2693 from giantlock/develop
...
dry mode activated by different key in *BSD
2012-11-25 19:34:09 -08:00
Thomas S Hatch
508f1fd640
Merge pull request #2692 from s0undt3ch/issues/2688
...
Switch `source` for `.`(dot) for sourcing. Fixes #2688 .
2012-11-25 19:32:39 -08:00
Joseph Hall
d5e12b0967
Merge pull request #2698 from techhat/baremetal
...
Rename grub.py to grub_legacy.py
2012-11-25 18:06:47 -08:00
Pedro Algarvio
65d5e6dcc9
Include DEPRECATED
in the deprecated output options.
2012-11-26 00:37:57 +00:00
Pedro Algarvio
fd283e9689
Improved SaltReturnAssertsMixIn
.
...
* Added `assertReturnSaltType` which is dictionary for non errors.
* Added `assertReturnNonEmptySaltType` which does the above and makes sure it's not empty.
* Fix `tests.integration.states.user.UserTest` which was using wrongly using `assertSaltTrueReturn` on 'user.info' calls.
2012-11-25 22:29:08 +00:00
Pedro Algarvio
9e8d27e81b
Do assertSaltTrueReturn
on each of the salt calls.
2012-11-25 22:28:30 +00:00
Pedro Algarvio
ee8a4faccc
Make sure that parts are also dictionaries.
2012-11-25 20:11:24 +00:00
Keith Edmunds
a4869208e9
Rework Linux and FreeBSD insatllation pages
2012-11-25 16:23:01 +00:00
Pedro Algarvio
b59464792a
fcntl
is not available on windows.
2012-11-25 15:23:04 +00:00
Denis Generalov
cf2da2fa39
dry mode activated by different key in *BSD
2012-11-25 17:52:07 +04:00
Pedro Algarvio
ecfbbb3359
Switch source
for .
(dot) for sourcing. Fixes #2688 .
...
* The `.`(dot) seems to be the most supported way to source files on the various "major" linux shells.
2012-11-25 11:41:20 +00:00
Thomas S Hatch
b3d77c04c9
Merge pull request #2690 from techhat/baremetal
...
Adding the remainder of functions for parted
2012-11-24 11:55:51 -08:00
Thomas S Hatch
0041827f24
Merge pull request #2689 from BackSeat/develop
...
Tweak introduction page of doco
2012-11-24 11:51:13 -08:00
Thomas S Hatch
f7a78c2474
Merge pull request #2687 from kjkuan/develop
...
Update stateconf renderer doc, plus watch and mod_watch doc
2012-11-24 11:39:55 -08:00
Joseph Hall
3243107609
Rename grub.py to grub_legacy.py
2012-11-24 09:53:14 -07:00
Joseph Hall
7d04d94eac
Add link to online GNU docs
2012-11-24 09:42:11 -07:00
Joseph Hall
302fbc960c
Adding the remainder of functions for parted
2012-11-24 09:40:07 -07:00
Joseph Hall
c357230856
And then I discovered parted -m...
2012-11-24 08:40:55 -07:00
Joseph Hall
f38d3e2ce5
Rename partition.py to parted.py
2012-11-24 08:40:31 -07:00
Keith Edmunds
30ab9ab454
Tweak introduction page of doco
2012-11-24 14:32:09 +00:00
Jack Kuan
06484a2d8b
Some random doc updates.
2012-11-24 02:07:53 -05:00
Jack Kuan
e1be2673a1
Update stateconf module doc.
2012-11-24 00:15:28 -05:00
Thomas S Hatch
d2f95cd47e
Merge pull request #2686 from kjkuan/develop
...
Add __all__ = ['render'] to avoid helper functions showing up in the mod...
2012-11-23 20:25:20 -08:00
Jack Kuan
05fab4190a
Add __all__ = ['render'] to avoid helper functions showing up in the module doc.
2012-11-23 21:35:44 -05:00
Sean Channel
4666b87628
Merge pull request #2685 from seanchannel/develop
...
lintian cleanups
2012-11-23 17:22:47 -08:00
Sean Channel
20ba3fbbeb
lintian cleanups
2012-11-23 17:17:57 -08:00
Sean Channel
c405cc067c
Merge pull request #2682 from seanchannel/develop
...
add upstart files to pkg
2012-11-23 13:38:59 -08:00
Sean Channel
e925cee2ee
add upstart files to pkg
2012-11-23 13:35:58 -08:00
Thomas S Hatch
22c97cb746
Make the reactor allow for glob matching
2012-11-23 14:17:34 -07:00
Thomas S Hatch
48fac189a9
another syntax error in reactor
2012-11-23 14:02:48 -07:00
Thomas S Hatch
5333cf79f8
Fix typo in new Reactor
2012-11-23 13:56:30 -07:00
Thomas S Hatch
012462bee1
Add Reactors clas to utils.event
2012-11-23 13:51:55 -07:00
Thomas S Hatch
afea51ad1d
Add reactors to the master config defaults
2012-11-23 13:51:36 -07:00
Thomas S Hatch
541a52abbf
Make renderers pass through kwargs data
2012-11-23 13:00:09 -07:00
Thomas S Hatch
5cdffadd09
Merge pull request #2680 from s0undt3ch/develop
...
Fix bug introduced in 6c3b69cc56
. Refs #2672 .
2012-11-23 09:11:02 -08:00
Thomas S Hatch
e9ab6cc09b
Merge pull request #2679 from s0undt3ch/issues/2677
...
Fix #2677
2012-11-23 09:04:50 -08:00
Pedro Algarvio
eacbdfdf93
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-11-23 17:02:18 +00:00
Pedro Algarvio
927f79eb94
Fix bug introduced in 6c3b69cc56
. Refs #2672 .
2012-11-23 16:58:45 +00:00
Thomas S Hatch
a343421f41
Merge pull request #2678 from s0undt3ch/develop
...
Add `tests.saltunittest.RedirectStdStreams`.
2012-11-23 08:53:31 -08:00
Thomas S Hatch
4f89835bee
Merge pull request #2675 from UtahDave/add_mysql_returner_docs
...
Add MySQL returner docs
2012-11-23 08:44:46 -08:00
Pedro Algarvio
4597b7f605
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-11-23 16:13:11 +00:00
Pedro Algarvio
1f6d7f2c1c
Disable DNS checks when using --local
. Fixes #2677 .
2012-11-23 16:08:02 +00:00
Pedro Algarvio
4fc12f58ee
Fix salt.utils.fopen
import error.
2012-11-23 12:33:28 +00:00
Pedro Algarvio
a6fd9bb60f
Add tests.saltunittest.RedirectStdStreams
.
...
* The `RedirectStdStreams` tests helper will allow to temporarily catch `stdout` and `stderr` output. Right now it's only used to **mute** the `tests.integration.runners.jobs.ManageTest.test_active()` output.
2012-11-23 12:19:09 +00:00
David Boucha
1db1287fab
Add MySQL to list of returners.
...
Add MySQL to list of returners.
Improve formatting of docstring so it looks better
in the actual documentation.
Add python module requirement
2012-11-22 22:30:34 -07:00
Thomas S Hatch
b1427e1fc8
Merge pull request #2673 from UtahDave/add_mysql_returner_docs
...
Add MySQL schema to docstring
2012-11-22 20:28:17 -08:00
David Boucha
93ab9704c6
Add MySQL schema to docstring
...
Add a MySQL schema required for the returner to work
to the docstring
2012-11-22 21:17:11 -07:00
Thomas S Hatch
7ffccdd2a7
Merge pull request #2672 from bugi/develop
...
make it possible to add a user with uid/gid 0
2012-11-22 19:46:55 -08:00