Thomas S Hatch
4a1ebef8f2
Merge pull request #6551 from felskrone/add_new_job_event
...
Add new job event
2013-08-07 12:44:17 -07:00
Samuel M Smith
80a6d5da73
Fixed the get_event method
...
Removed the spurious while loop timeout
2013-08-07 13:39:53 -06:00
Volker Schwicking
de5b6291a9
again spacing :-)
2013-08-07 20:57:18 +02:00
Volker Schwicking
a3a6fd3e52
spacing fix
2013-08-07 20:56:19 +02:00
Volker Schwicking
86d9b354a3
added a new event announcement to the master when a new job is published
2013-08-07 20:53:53 +02:00
Samuel M Smith
588f1bb625
Merge branch 'develop' of https://github.com/SmithSamuelM/salt into develop
2013-08-07 09:38:42 -06:00
Joseph Hall
2ad25d0f99
Merge pull request #6550 from pkruithof/develop
...
Added Augeas state module
2013-08-07 05:19:17 -07:00
Peter Kruithof
8658be8192
Added Augeas state module
2013-08-07 14:00:11 +02:00
Thomas S Hatch
07caa111bb
Merge pull request #6546 from s0undt3ch/develop
...
The parser destructive tests flag is now provided by salt-testing
2013-08-06 21:32:50 -07:00
Thomas S Hatch
8fe0e3c27f
Under the situation where the prerequired state creates
...
a recursive requisite populate the pre dict with the test=True data
instead of populating the running dict too early, this should fix the
last of #6057
2013-08-06 22:24:44 -06:00
Thomas S Hatch
243c348f26
Merge pull request #6547 from basepi/staterecursion5623
...
Don't run functions that compile states inside of states, Fix #5623
2013-08-06 21:21:45 -07:00
Thomas S Hatch
9890a7ccf1
Merge pull request #6549 from robertkeizer/couchdb_get_fun
...
Couchdb Returner additions
2013-08-06 21:20:17 -07:00
Robert Keizer
58eaf9100e
Small comment change.
2013-08-06 23:03:27 -05:00
Robert Keizer
19321c316b
Small but important comment.
2013-08-06 22:59:34 -05:00
Robert Keizer
087b21cdd4
Rename to minion-fun-timestamp instead of minion-fun-date.
2013-08-06 22:55:12 -05:00
Robert Keizer
6ead7c8dca
Sanity check on the command.
2013-08-06 22:53:28 -05:00
Robert Keizer
4b1d0b3caa
Reversing start and endkey as descending happens before keyfiltering. Working get_fun.
2013-08-06 22:51:47 -05:00
Robert Keizer
c08198ede7
Sorta working query on the by-minion-fun-date view. Invalid results, but query hits the db and returns properly.
2013-08-06 22:42:17 -05:00
Robert Keizer
345eddf0ae
Basic by-minion-fun-date view.
2013-08-06 22:28:32 -05:00
Robert Keizer
48e41f09d2
Working get_minions with design document being generated if needed.
2013-08-06 22:20:04 -05:00
Robert Keizer
d7144c1f07
Some cleanup.
2013-08-06 22:02:40 -05:00
Robert Keizer
a58f994d1c
working on get_valid_salt_views.
2013-08-06 22:00:48 -05:00
Robert Keizer
8211374f66
Sanity, we're not setting the design doc to be the contents of the doc.views.
2013-08-06 21:52:03 -05:00
Robert Keizer
42049001c4
Logic around when to update the design document.
2013-08-06 21:49:31 -05:00
Robert Keizer
9aebe05e85
Some whitespace. Also moving _ensure_views down.
2013-08-06 21:04:07 -05:00
Robert Keizer
4ec2769f00
Working on whitelisting get_jids ID specification.
2013-08-06 21:01:50 -05:00
Robert Keizer
482a5f0adf
Fixing up a simple error. Also made some comments regarding whitelisting document IDs
2013-08-06 20:49:27 -05:00
Robert Keizer
583a1bf22e
Merging upstream.
2013-08-06 20:26:18 -05:00
Erik Johnson
ca28d6abdf
Merge pull request #6548 from terminalmage/docs
...
improve formatting in remote execution tutorial
2013-08-06 17:22:31 -07:00
Erik Johnson
4ce370b679
improve formatting in remote execution tutorial
2013-08-06 19:21:39 -05:00
Samuel M Smith
c5f78868fd
ignore wingide project files
2013-08-06 17:30:37 -06:00
Samuel M Smith
e95f491e04
Added __verify_fun to low method
2013-08-06 17:29:05 -06:00
Colton Myers
74269ab625
Don't run functions that compile states inside of states, Fix #5623
2013-08-06 15:57:25 -06:00
Pedro Algarvio
305a5c2223
The parser destructive tests flag is now provided by salt-testing
2013-08-06 22:03:42 +01:00
Thomas S Hatch
5310a1a4a8
Since this is a transient return it can be a bit smaller
2013-08-06 13:44:45 -06:00
Thomas S Hatch
d88bee3aae
Fix #6520
...
prereq will now detect if mod_watch is expected to be triggered and report the trigger as a change
2013-08-06 13:43:29 -06:00
Thomas S Hatch
1d2dc9b865
Fix stack trace in prereq, fix #6057
2013-08-06 13:11:20 -06:00
Joseph Hall
6e286e1897
Merge pull request #6540 from s0undt3ch/develop
...
We currently do **not** want pylint 1.0.0 since logilab-common-0.60.0 is not yet released
2013-08-06 11:34:40 -07:00
Pedro Algarvio
2b0bc7056e
Under python 2.6 using {}.format()(without an index) is a ValueError.
2013-08-06 19:29:08 +01:00
Joseph Hall
3008c5bb0a
Merge pull request #6541 from michaelrice/tc-state-pep8
...
pep 8 clean up on tomcat state
2013-08-06 11:26:21 -07:00
Pedro Algarvio
f704550dd7
We currently do **not** want pylint 1.0.0 since logilab-common-0.60.0 is not yet released.
2013-08-06 18:59:50 +01:00
Pedro Algarvio
7f2bd90f87
Uninstall and reinstall pylint.
2013-08-06 18:59:50 +01:00
Michael Rice
70adfd25e2
pep 8 clean up on tomcat state
2013-08-06 12:59:34 -05:00
Thomas S Hatch
c011cf980e
Merge pull request #6539 from s0undt3ch/develop
...
Unfortunately `pylint` gets a bit lost when analysing the `distutils.version` import
2013-08-06 10:00:51 -07:00
Pedro Algarvio
42c9cfab8c
Call the proper pylint binary.
2013-08-06 17:50:14 +01:00
Pedro Algarvio
de54ef7389
Update to latest pylint.
2013-08-06 17:40:26 +01:00
Pedro Algarvio
b595321dfa
Unfortunately pylint gets a bit lost when analysing the distutils.version import.
2013-08-06 17:27:02 +01:00
David Boucha
537af344ff
Merge pull request #6537 from ranl/develop
...
fix return if no changes should take place in tomcat.war_deployed
2013-08-06 05:11:37 -07:00
ran
95ead0da96
fix return if no changes should take place in tomcat.war_deployed
2013-08-06 12:48:40 +03:00
Thomas S Hatch
ecb18e2260
Merge pull request #6535 from UtahDave/add_virtual_tests
...
Test for Xen virtual machine in grains on Windows.
2013-08-05 21:23:56 -07:00
