Pedro Algarvio
66e3bea992
Add __context__
to .pylintrc
2012-12-28 13:35:29 +00:00
Pedro Algarvio
eaa4f68567
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-12-28 10:56:06 +00:00
Pedro Algarvio
caea4625f7
Add log
to .pylintrc
good names setting. Refs #1775 .
2012-12-28 10:54:28 +00:00
Thomas S Hatch
b048d5640b
Merge pull request #3053 from shadowfax-chc/develop
...
ebuild depclean function
2012-12-27 22:35:06 -08:00
Thomas S Hatch
a1a6d4abe5
INitial feature commit for git backend
...
This adds a git fileserver backend, a few of the capabilities still
need to be hooked in, and some threading issues need to be adressed
but other than that this should be ready for testing
2012-12-27 23:27:25 -07:00
Thomas S Hatch
7420579e15
Merge pull request #3057 from archtaku/docs
...
Remove sentence from development virtualenv docs
2012-12-27 21:56:58 -08:00
Erik Johnson
70f14c6c0f
Remove sentence from development virtualenv docs
...
Per https://github.com/saltstack/salt/pull/3042#issuecomment-11715005
2012-12-27 23:32:48 -06:00
Thomas S Hatch
ed47093056
Merge pull request #3056 from techhat/smtp_return
...
Add SMTP returner
2012-12-27 21:29:57 -08:00
Joseph Hall
703a94b135
Add SMTP returner
2012-12-27 22:10:32 -07:00
shadowfax-chc
e58368ab5c
Updated ebuild purge to call depclean after remove
2012-12-27 23:36:58 -05:00
shadowfax-chc
f20c5fc3a6
Corrected doc for depclean
2012-12-27 23:32:31 -05:00
Jeff Schroeder
05f9987d57
Fixing a few non-salt functions which where showing up in the autodoc
...
These were showing up as state module functions:
- yaml_load
- YamlCustomLoader
2012-12-27 21:44:10 -06:00
Thomas S Hatch
843e01a7f4
Merge pull request #3054 from tchap/print-batch-results
...
Fix the batch mode not printing the results
2012-12-27 19:27:30 -08:00
Thomas S Hatch
7b2b28e366
Merge pull request #3055 from techhat/iptables
...
Add the ability to save rules to disk
2012-12-27 19:26:28 -08:00
Joseph Hall
95f9a35e1a
Add the ability to save rules to disk
2012-12-27 20:19:19 -07:00
Ondrej Kupka
073e34a77f
Fix the batch mode not printing the output
2012-12-28 03:19:57 +01:00
Thomas S Hatch
54a98ed14d
Merge pull request #3052 from torhve/virt-fixes
...
Support block devices in virt.get_disks
2012-12-27 17:14:08 -08:00
Thomas S Hatch
8b5841be61
Starting work on git fileserver backend
2012-12-27 18:12:16 -07:00
Tor Hveem
84fc505937
Support block devices in virt.get_disks
2012-12-28 02:10:21 +01:00
shadowfax-chc
39a2470387
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2012-12-27 20:02:30 -05:00
Thomas S Hatch
3499f6589f
Merge pull request #3051 from techhat/facls
...
Finish up FACL support for Linux
2012-12-27 14:31:32 -08:00
Joseph Hall
6e73db7ce7
Add the ability to add/modify facls
2012-12-27 15:26:00 -07:00
Joseph Hall
a7ca7be9f9
Fix docstrings, add delfacl
2012-12-27 15:20:34 -07:00
Thomas S Hatch
fa06e44d4f
Add fileserver_backend option to default config
2012-12-27 14:21:56 -07:00
Thomas S Hatch
39a6f49d8a
Finish modularizing the file server!!
...
This adds support for file server backends to be created in a modular way
and thus opening the way for the file server to function directly
off of a git repository or a database
2012-12-27 14:09:26 -07:00
Thomas S Hatch
741a47ace7
Fix overseen imports in roots file server backend
2012-12-27 14:09:26 -07:00
Thomas S Hatch
13192bbf66
Add fileserver modules to setup.py
2012-12-27 14:09:26 -07:00
Thomas S Hatch
003e87ac93
Add file server hook into AESFuncs object
2012-12-27 14:09:26 -07:00
Thomas S Hatch
ffbee359f5
Add fileserver_backend config option default to master
2012-12-27 14:09:26 -07:00
Thomas S Hatch
b00ea7c660
Start adding modular file server backends
2012-12-27 14:09:26 -07:00
Thomas S Hatch
70407af04b
Add fileserver to the loader
2012-12-27 14:09:26 -07:00
Thomas S Hatch
141a8c0f6a
Merge pull request #3050 from techhat/iptables
...
Putting --sports and --dports where they belong
2012-12-27 13:08:46 -08:00
Joseph Hall
90bdab4a19
Putting --sports and --dports where they belong
2012-12-27 14:07:36 -07:00
Thomas S Hatch
f56c40e54a
Merge pull request #3049 from techhat/iptables
...
Adding dports and sports
2012-12-27 13:03:53 -08:00
Joseph Hall
7441158887
Adding dports and sports
2012-12-27 13:58:25 -07:00
Joseph Hall
2c433ab9bc
Adding function to delete facls
2012-12-27 13:54:24 -07:00
Thomas S Hatch
11f5089cce
Merge pull request #3048 from whiteinge/token-expire
...
Bumped default token lifetime from 12 minutes to 12 hours; added config
2012-12-27 12:02:28 -08:00
Seth House
0fce26db87
Bumped default token lifetime from 12 minutes to 12 hours; added config
2012-12-27 12:59:37 -07:00
Thomas S Hatch
4b7b2a63cd
Merge pull request #3047 from techhat/facls
...
Adding initial FACL support for Linux
2012-12-27 11:58:30 -08:00
Joseph Hall
d60ffc6b38
Removing prints
2012-12-27 12:58:09 -07:00
Joseph Hall
ac66ee9cfd
Adding initial FACL support for Linux
2012-12-27 12:54:11 -07:00
Thomas S Hatch
0b79d5400c
Merge pull request #3045 from gotcha/patch-3
...
Update doc/ref/states/highstate.rst
2012-12-27 11:16:32 -08:00
Godefroid Chapelle
6c74931ea8
Update doc/ref/states/highstate.rst
...
fix Rest formatting mistakes
2012-12-27 20:12:18 +01:00
Thomas S Hatch
7a9a4980ad
Merge pull request #3044 from s0undt3ch/develop
...
Include empty string in `__virtual__()` loader comment.
2012-12-27 11:05:25 -08:00
Pedro Algarvio
40768c5b3f
Include empty string in __virtual__()
loader comment.
2012-12-27 19:00:59 +00:00
David Boucha
04e934b3ed
Merge pull request #3005 from SEJeff/features/consistent-windows-detection
...
RFC: Consistently detect windows
2012-12-27 10:35:48 -08:00
Thomas S Hatch
bd37bbed5d
Merge pull request #3042 from archtaku/docs
...
Clarify virtualenv installation/configuration docs
2012-12-27 10:31:51 -08:00
Erik Johnson
23ca7f049a
Clarify virtualenv installation/configuration docs
...
Since the "pidfile" param has been added to the list of params for which
root_dir is prepended, editing the pidfile is no longer necessary when
running from a recent git checkout. Added a note to clarify this.
2012-12-27 11:51:56 -06:00
Thomas S Hatch
c197152210
Merge pull request #3041 from archtaku/docs
...
cleanup for 8bb8143
2012-12-27 09:32:11 -08:00
Erik Johnson
6739eca926
cleanup for 8bb8143
2012-12-27 11:29:46 -06:00