Justin Carmony
1a333692ac
Adding a reference to watch_in on the highstate reference
2013-03-27 21:44:57 -06:00
Thomas S Hatch
75e7917025
only use zmq identity if the sub_timeout is being used
2012-06-06 09:08:18 -06:00
Thomas S Hatch
bdbf21d7ab
Add timeouts to zmq polling for the minion
2012-06-06 08:54:17 -06:00
Thomas S Hatch
e9ec1ae9b5
change with sequence in event gathering
2012-06-06 02:26:49 -06:00
Thomas S Hatch
fc3b1cbaac
Update event system to not block
2012-06-06 02:17:54 -06:00
Thomas S Hatch
3664f0b491
Move base client over to event system
2012-06-06 02:17:09 -06:00
Thomas S Hatch
42c4865908
make the event returner trim off the tag
2012-06-06 01:31:09 -06:00
Thomas S Hatch
ccc11ad02e
initial event command return watcher
2012-06-06 01:29:31 -06:00
Thomas S Hatch
b0f238eaba
the event module works!
2012-06-06 01:20:40 -06:00
Thomas S Hatch
641b67938c
Add missing argumetns to event system
2012-06-06 01:16:03 -06:00
Thomas S Hatch
6c6e1c790c
move creation of AESFuncs so that we can bind to zmq inside the object
2012-06-06 01:02:38 -06:00
Thomas S Hatch
48f27938ba
dumop event data to a string
2012-06-06 00:43:53 -06:00
Thomas S Hatch
f4f1cbf2c5
I of all people should know, it is opts
2012-06-06 00:29:12 -06:00
Thomas S Hatch
97904fee62
uncommented...
2012-06-06 00:27:10 -06:00
Thomas S Hatch
b8c3bd5c21
Add event fireing for minion returns
2012-06-06 00:25:31 -06:00
Thomas S Hatch
71a9f57046
Minor change to event docstring
2012-06-06 00:23:46 -06:00
Thomas S Hatch
b9cc20566b
Add in event system
2012-06-06 00:15:00 -06:00
Thomas S Hatch
78632d1968
Merge pull request #1408 from twinshadow/alias-vlan-fix
...
Simple regex fix for Linux aliases and VLAN tags
2012-06-05 20:59:58 -07:00
Anthony Cornehl
daae29adf6
Simple regex fix for Linux aliases and VLAN tags
2012-06-05 20:49:46 -07:00
Thomas S Hatch
8de4dbc13d
disable failing aliases tests
2012-06-05 18:11:15 -06:00
Thomas S Hatch
ef6b027e90
Fix salt key tests for new no_color option
2012-06-05 18:10:59 -06:00
Thomas S Hatch
5b05d77405
Add sock_dir setting for the integration test syndic
2012-06-05 17:51:52 -06:00
Thomas S Hatch
c2d92d3118
Add sock_dir default option to minion for event system
2012-06-05 17:10:00 -06:00
Thomas S Hatch
393e84924d
Fix color loading for saltkey api calls
2012-06-05 17:05:23 -06:00
Thomas S Hatch
f3c7b5be5f
Fix path loading for shell tests
2012-06-05 17:04:28 -06:00
Thomas S Hatch
b81857a70f
Add color management to salt key
2012-06-05 15:59:27 -06:00
Thomas S Hatch
c61a829144
Add no-color option to salt-key
2012-06-05 15:36:18 -06:00
Thomas S Hatch
b294cf2aa9
Clean up strings in new scripts moodule
2012-06-05 15:29:51 -06:00
Thomas S Hatch
d5fb59d9fe
Merge pull request #1405 from iffy/doc
...
Clarified where the top.sls file goes
2012-06-05 14:02:43 -07:00
Matt Haggard
8035751678
Clarified where the top.sls file goes
2012-06-05 14:54:21 -06:00
Thomas S Hatch
f61b028e58
Don't verify the jobs directory when switching users
2012-06-05 12:57:19 -06:00
Thomas S Hatch
dd2f432a19
Merge pull request #1404 from iffy/doc
...
Added missing line so code block renders
2012-06-05 11:49:45 -07:00
Thomas S Hatch
4e8ed936ec
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-06-05 12:48:50 -06:00
Thomas S Hatch
9cf0ec2da4
Add poller calls to sub_timeout seq
2012-06-05 12:48:13 -06:00
Matt Haggard
6075bee8f4
Added missing line so code block renders
2012-06-05 12:47:32 -06:00
Thomas S Hatch
514b3edb76
Merge pull request #1403 from iffy/doc
...
Document current problem installing on Ubuntu 11.04 with workaround
2012-06-05 11:43:12 -07:00
Matt Haggard
17f3865339
Document current problem installing on Ubuntu 11.04 with workaround
2012-06-05 12:39:51 -06:00
Thomas S Hatch
efa7f30dcb
switch to zmq poller which should make the minion more stable
2012-06-05 12:28:16 -06:00
Thomas S Hatch
7ad6b3c6e4
Add abaility to disable minion modules in the swarm
2012-06-05 11:44:01 -06:00
Thomas S Hatch
0f65bb2407
Merge pull request #1400 from benoitbryon/console_scripts
...
setup.py : use console_scripts instead of scripts when setuptools is available
2012-06-05 10:38:18 -07:00
Benoit Bryon
ee0072d3e8
Updated setup(): use setuptools' console_scripts if available, else fallback to distutils' scripts. Refs #1028 .
2012-06-05 12:00:20 +02:00
Thomas S Hatch
5c6b8aea28
docstring cleanups for ssh tests
2012-06-04 17:22:43 -06:00
Thomas S Hatch
a0d7c4ac9e
Merge pull request #1396 from kwarterthieves/develop
...
more py3k fixes
2012-06-04 16:12:26 -07:00
L.C. Rees
cc8a921311
- more py3k fixes
2012-06-04 16:40:34 -06:00
Thomas S Hatch
57c08e3ef6
enable module disable features
2012-06-04 15:57:55 -06:00
Thomas S Hatch
f9098f8a50
Clean up yaml utils
2012-06-04 14:10:55 -06:00
Thomas S Hatch
11d481260a
Comment on yaml issue that is now resolved
2012-06-04 13:40:35 -06:00
Thomas S Hatch
2a58b33f10
Fix issue where modes like 007 would always fail
...
The file state was checking for 007 to equal 7, this obviously failed,
so the same logic used to generate the integer if used to compare the
integer now
2012-06-04 13:37:31 -06:00
Thomas S Hatch
46041df022
Fix #1366
...
This addition verifies ints when they are passed in with preceeding 0s
2012-06-04 13:31:29 -06:00
Thomas S Hatch
39ddffb2d7
Fix traces in yaml utils
2012-06-04 13:02:22 -06:00