Thomas S Hatch
bc7408339a
Merge pull request #2789 from giantlock/develop
...
one_fqdn AND other_fqdn will always return empty set
2012-12-03 23:48:13 -08:00
Thomas S Hatch
a1a833321e
Merge pull request #2791 from dekkers/only-refresh-modules-on-changes
...
Only refresh the modules when state changed
2012-12-03 23:47:42 -08:00
Sean Channel
439358aa8c
drop .template from cfg file names
2012-12-03 23:44:28 -08:00
Sean Channel
0d7732930a
drop .template from cfg file names
2012-12-03 23:42:18 -08:00
Sean Channel
fdbbb72131
install bash completion and UFW firewall config
2012-12-03 23:36:33 -08:00
Pedro Algarvio
4bf9bd3c77
Unregister the socket!!!!!! And delete the poller.
2012-12-04 02:17:48 +00:00
David Boucha
7cb608fdb5
Merge pull request #2794 from FireHost/minor_mongo_pillar_fix
...
Minor mongo pillar fix
2012-12-03 18:13:43 -08:00
Aaron Tygart
020c4f0710
Fix yet more whitespace issues
2012-12-03 20:09:34 -06:00
Aaron Tygart
468548a20f
Fix trailing whitespace
2012-12-03 20:08:40 -06:00
Aaron Tygart
6e5566217d
Fix mongo ext_pillar pillar data clobbering
2012-12-03 20:01:29 -06:00
David Boucha
995506deb2
Merge pull request #2792 from Talksum/rh_ip_fix_2790
...
Rh ip fix 2790
2012-12-03 17:08:02 -08:00
Pedro Algarvio
08aaecee12
Merge branch 'develop' of github.com:saltstack/salt into hotfix/gdb-resources
2012-12-04 00:55:50 +00:00
Mike Chesnut
b24546607f
fix for network state handling on RH-based machines
...
this is in response to issue #2790 (and thanks to the suggested fix
from UtahDave!)
2012-12-03 16:19:46 -08:00
Mike Chesnut
a58ec79b27
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2012-12-03 16:17:58 -08:00
Jeroen Dekkers
70fb32901c
Only refresh the modules when state changed
...
We used to refresh all the modules with every execution of a pkg
state, even when nothing had changed. Now we only refresh the module
if the state has changed anything.
2012-12-04 01:00:19 +01:00
Pedro Algarvio
b0f594f452
run_script timeout's are not supported under windows.
2012-12-03 23:58:08 +00:00
Pedro Algarvio
3b0388c8f4
Merge branch 'develop' of github.com:saltstack/salt into hotfix/gdb-resources
2012-12-03 23:42:23 +00:00
Pedro Algarvio
b866ca3af0
Just detach from parent group.
2012-12-03 23:41:45 +00:00
Pedro Algarvio
9e89f357aa
Remove unused code.
2012-12-03 23:36:20 +00:00
Pedro Algarvio
5d274e8b7d
Let's keep using multiprocessing.
2012-12-03 23:35:32 +00:00
Pedro Algarvio
955c06abc2
Close ZMQ socket's when finished with them and term() contexts too.
2012-12-03 23:34:34 +00:00
Pedro Algarvio
2246bf3d33
Remove unused code.
2012-12-03 23:32:58 +00:00
Pedro Algarvio
7b10a7cd64
Merge branch 'develop' of github.com:saltstack/salt into hotfix/gdb-resources
2012-12-03 23:31:29 +00:00
Pedro Algarvio
a3bfa4f41e
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-12-03 23:30:59 +00:00
Pedro Algarvio
a9669acf3a
Kill tests run_script shell and it's children.
2012-12-03 23:30:21 +00:00
David Boucha
734031a549
Merge pull request #2784 from FireHost/fix_path_access_check_windows
...
Fix path access check windows
2012-12-03 15:25:13 -08:00
Denis Generalov
585f46d859
one_fqdn AND other_fqdn will always return empty set
2012-12-04 03:21:15 +04:00
David Boucha
f29851df76
Merge pull request #2787 from romeotheriault/openbsdpkg-multi
...
openbsdpkg multi-package installation support
2012-12-03 15:07:05 -08:00
Pedro Algarvio
66117e20ba
A little house keeping on salt's minion.
...
Keep a reference to all processes/threads started on decoded payload processing so they can be cleaned up.
2012-12-03 22:40:44 +00:00
Pedro Algarvio
68790b1b7d
Merge branch 'develop' of github.com:saltstack/salt into hotfix/gdb-resources
2012-12-03 22:32:43 +00:00
David Boucha
c5392e8726
Merge pull request #2781 from UtahDave/add_file.diff
...
Just return diff instead of a state-like return
2012-12-03 13:42:42 -08:00
David Boucha
0e7e383ff5
Merge pull request #2785 from dekkers/fix-typo
...
Fix typo
2012-12-03 13:34:53 -08:00
Pedro Algarvio
c89a6788f4
Is this what's needed under python 2.6 for tests to complete?
2012-12-03 21:07:51 +00:00
Jeroen Dekkers
6194ed2eb8
Fix typo
2012-12-03 21:26:07 +01:00
David Boucha
fd9a0435e0
Merge pull request #2782 from UtahDave/add_module_fieldlists
...
Add module field list documentation
2012-12-03 12:13:12 -08:00
David Boucha
e2dba0ecae
Add module field list documentation
2012-12-03 11:39:38 -07:00
Thomas S Hatch
1958060625
Merge pull request #2780 from giantlock/develop
...
fix #2762
2012-12-03 08:56:50 -08:00
Denis Generalov
4b22c6ccba
fix typo
2012-12-03 20:20:24 +04:00
David Boucha
e8ae097dc5
Just return diff instead of a state-link return
2012-12-03 09:08:29 -07:00
Pedro Algarvio
2c8b982901
Re-use ZMQ Poller in SQRE.
2012-12-03 12:34:15 +00:00
Thomas S Hatch
4a07e54a6e
Merge pull request #2779 from s0undt3ch/hotfix/pillar_version
...
`0.10.5` is out, bump `pillar_version` to 2.
2012-12-03 04:22:41 -08:00
Thomas S Hatch
25a23a77c1
Merge pull request #2778 from s0undt3ch/issues/2763
...
Support syslog logging Fixes #2763
2012-12-03 04:21:10 -08:00
Pedro Algarvio
e0eaa4bef3
0.10.5 is out, bump pillar_version to 2.
2012-12-03 12:15:57 +00:00
Pedro Algarvio
6413c5d8e3
Add the syslog logging feature documentation to the template configuration files. Refs #2763 .
2012-12-03 12:13:32 +00:00
Thomas S Hatch
530e67e74a
remove sub_timout from the minon default config
2012-12-03 05:09:35 -07:00
Pedro Algarvio
0995c64071
Add support for using syslog as a logging handler. Fixes #2763 .
...
* Without changing how the log file is specified, we added the ability to specify the address for the system's syslog. It can be `tcp://localhost:514/LOG_USER`, `tcp://localhost/LOG_DAEMON` or `file:///dev/log/LOG_SYSLOG`, more examples on the docstring.
* Minor changes on the minion configuration loading, if there's a `urlparse` scheme on one of `log_file` and `key_logfile`, then it's a syslog setting and it should not be `root_dir` prepended.
2012-12-03 11:58:26 +00:00
Sean Channel
6f29387177
shebang bang baby
2012-12-03 01:38:43 -08:00
Sean Channel
e6d95c9cdb
update rules
2012-12-03 00:08:52 -08:00
Sean Channel
d0d28dce1d
use shared upsatart, logrotate, and systemd scripts
2012-12-02 23:45:17 -08:00
Seth House
13b58d24ea
Added workaround for circular import problem
2012-12-02 19:07:52 -07:00
