Thomas S Hatch
827ee0ddb3
Fix #4102
...
The scheduler was not explicitly calling the returner function
2013-04-28 20:24:22 -06:00
Thomas S Hatch
2affd3ee2a
Add extra include docs, fix #4274
2013-04-28 20:19:43 -06:00
Thomas S Hatch
0c2b2fe9c4
Since turning on ipv6 can break ipv4 in some networks only enable
...
ipv6 if explicity devind in the config. Also since pyzmq will still
have the flag and then fail silently if the underlying zmq does not support
ipv6
2013-04-28 19:39:14 -06:00
Thomas S Hatch
ab5f540430
Merge pull request #4232 from tohojo/ipv6-support
...
IPv6 support for master-minion communication
2013-04-28 18:34:28 -07:00
Thomas S Hatch
b8a9620411
Merge pull request #4632 from s0undt3ch/hotfix/fix-travis-again
...
We're no longer leaking threads. Travis-CI should be OK with 10 worker threads
2013-04-28 10:15:52 -07:00
Joseph Hall
4142bf4486
Merge pull request #4631 from ranl/develop
...
tomcat module addition
2013-04-28 05:42:06 -07:00
ran
bb4306f422
tomcat module addition
...
- tomcat wait function
- tomcat mod_watch funtion
- a bit of docs fix
2013-04-28 10:20:18 +03:00
Pedro Algarvio
397418dad7
We're no longer leaking threads. Travis-CI should be OK with 10 worker threads.
2013-04-28 08:16:54 +01:00
Thomas S Hatch
62843e66d0
Merge pull request #4628 from s0undt3ch/develop
...
Require root perms
2013-04-27 14:39:19 -07:00
Pedro Algarvio
c4e96207cb
runas needs root permissions.
2013-04-27 21:06:13 +01:00
Pedro Algarvio
b88d901b78
Allow the event listener to work with the test sockets. And even for the minion's
2013-04-27 20:39:33 +01:00
Thomas S Hatch
de8d29c8e5
Add id from originating minion if sent to the publish
2013-04-27 13:25:32 -06:00
Thomas S Hatch
cebdf76f2e
Fix publish tests
2013-04-27 12:59:34 -06:00
Thomas S Hatch
2375faa82c
Check for OSError as well
2013-04-27 12:40:54 -06:00
Joseph Hall
3e139bb96a
Adding comments to try and keep people from "fixing" code
2013-04-27 12:30:20 -06:00
Thomas S Hatch
55d303d6df
Fix #4287
2013-04-27 10:27:41 -06:00
Thomas S Hatch
e0dcc08f98
Add docstring to master_pub method
2013-04-27 10:14:43 -06:00
Thomas S Hatch
473154f488
Add user reporting to the job cache reports
...
This fixes #4301 , basically we already log the originating user,
and have done so for about a year, we just did not allow for the
standard way of reading the log to print out the user
2013-04-27 10:08:27 -06:00
Thomas S Hatch
7952ada1dc
Change name to revoke_auth for consistency
...
Ref #4240
2013-04-27 10:01:36 -06:00
Thomas S Hatch
9623562b82
Fix #4240
...
saltutil.revoke_key will allow a minion to revoke its own key on the master
2013-04-27 09:57:16 -06:00
Thomas S Hatch
ae6068bf9b
Add revoke key method to master controller
2013-04-27 09:49:30 -06:00
Thomas S Hatch
b855a7687e
Merge pull request #4626 from s0undt3ch/develop
...
Improve logging logic in `salt/template.py`. Allow the test suite to set/handle more logging levels
2013-04-27 08:37:19 -07:00
Pedro Algarvio
3ce1226fd6
Merge pull request #4625 from terminalmage/apt_optimization
...
apt: replace aptitude with grep-available
2013-04-27 04:40:15 -07:00
Pedro Algarvio
a43e0132f1
Improve logging logic in salt/template.py. Allow the test suite to set more logging levels.
2013-04-27 09:56:24 +01:00
Erik Johnson
2f49680348
apt: replace aptitude with grep-available
...
This commit replaces the call to aptitude within list_pkgs with
grep-available, which dramatically speeds up virtual package detection.
This replaces the dependency on aptitude for virtual package detection
with a dependency on dctrl-tools.
2013-04-27 01:45:23 -05:00
Joseph Hall
65a6cb06da
Merge pull request #4624 from s0undt3ch/develop
...
Fix indentation, again. Apparently I lost this change somehow.
2013-04-26 21:11:58 -07:00
Pedro Algarvio
e15712efb1
Fix indentation, again. Apparently I lost this change somehow.
2013-04-27 02:00:27 +01:00
Thomas S Hatch
d9affa67e6
Moved render log data to better location
2013-04-26 16:56:50 -06:00
Thomas S Hatch
4e037467a8
Log rendered output at each stage
2013-04-26 16:56:09 -06:00
Thomas S Hatch
d67b686713
Merge pull request #4608 from s0undt3ch/develop
...
Fix issues with salt's file state and file module
2013-04-26 15:46:11 -07:00
David Boucha
6c1dba116a
Merge pull request #4619 from UtahDave/develop
...
fix missing letter in module name
2013-04-26 15:22:48 -07:00
David Boucha
b4f65d338e
fix missing letter in module name
2013-04-26 16:20:56 -06:00
Thomas S Hatch
1c41c5e159
Add debug output for jinja templates
2013-04-26 16:06:05 -06:00
Thomas S Hatch
e46180f1e8
untested fix for windows multiproc minion
2013-04-26 13:32:31 -06:00
Thomas S Hatch
b7f6becdc8
Fix spelling error
2013-04-26 13:03:37 -06:00
Thomas S Hatch
3b9b831875
Check the gitpython version, fix #4595
2013-04-26 12:58:28 -06:00
Thomas S Hatch
23f5eb4f96
Fix #4510
2013-04-26 12:28:01 -06:00
Thomas S Hatch
f22118e3ae
Merge pull request #4603 from geops/postgres.owner_to
...
Command to change the ownership of all relations in a database
2013-04-26 11:10:08 -07:00
Thomas S Hatch
54eb32f664
cover the case of a ./../ expose in the fileserver
2013-04-26 11:14:35 -06:00
Thomas S Hatch
70704213d9
Fix security issue where minions can access any file on the master
2013-04-26 10:30:28 -06:00
Joseph Hall
698a109d5c
Merge pull request #4616 from UtahDave/develop
...
Bump windows installer version
2013-04-26 09:07:56 -07:00
David Boucha
c0aef8bccd
Bump windows installer version
2013-04-26 10:03:28 -06:00
Seth House
23f52b5b2b
Revert "Added sanity-check that requested path lives inside file_roots"
...
This reverts commit 843fb62884
2013-04-26 09:51:44 -06:00
Pedro Algarvio
89884a0c11
Merge pull request #4615 from kinware/versions-report-2
...
Add test.versions_information(). Fix stray print() call in version.py.
2013-04-26 06:59:19 -07:00
Kinware AB
03f3de00bc
Move imports to top level in test module.
2013-04-26 15:57:20 +02:00
Kinware AB
d71afa107a
Add test.versions_information(). Fix stray print() call in version.py.
2013-04-26 13:42:20 +02:00
Seth House
843fb62884
Added sanity-check that requested path lives inside file_roots
2013-04-26 00:34:25 -06:00
Colton Myers
87ab11e8ee
Merge pull request #4612 from basepi/jinjafix4236
...
Clean up some PEP8 stuff
2013-04-25 19:02:51 -07:00
Thomas S Hatch
7d25b5ed42
Merge pull request #4604 from ranl/develop
...
enable the quiet argument in cmd state and module
2013-04-25 18:27:49 -07:00
Thomas S Hatch
0072cb951c
Merge pull request #4601 from terminalmage/version_wildcards
...
Add glob support to pkg.version
2013-04-25 18:25:11 -07:00
