Commit Graph

30843 Commits

Author SHA1 Message Date
Erik Johnson
63094f1463 Remove output_loglevel='debug'
With the default loglevel now set to debug, setting it to debug when
invoking cmd.* is redundant.
2014-05-16 17:50:53 -05:00
Erik Johnson
5cff1f81cc Change default output_loglevel to debug 2014-05-16 17:30:14 -05:00
Ahmad Sherif
0d94f4326d Move mine_interval example to a minion conf file
mine_interval has no effect when added in a pillar
2014-05-17 01:22:38 +03:00
Samuel Smith
11892ee78d Merge pull request #12858 from SmithSamuelM/sam_raet_39
removed debug line
2014-05-16 16:17:59 -06:00
Samuel M Smith
a926d46421 removed debug line 2014-05-16 16:15:51 -06:00
Colton Myers
f1960a9f46 Populate 'Changes' on docker.installed container creation 2014-05-16 16:13:59 -06:00
Samuel Smith
92c5a084a9 Merge pull request #12856 from SmithSamuelM/sam_raet_39
Fixed  a couple of bugs from latest develop. Added some changes for Raet changes
2014-05-16 16:10:39 -06:00
Samuel M Smith
5646e45e4b Fixed bug in ip_addrs
On OS X there is no 'label' field
Cleaned up logic so more readable
2014-05-16 16:08:42 -06:00
Colton Myers
aec2379d9c Merge pull request #12847 from basepi/archiveextracteddocs12498
Add note about ``if_missing`` to archive.extracted
2014-05-16 16:05:56 -06:00
Samuel M Smith
10395931f3 Merge remote-tracking branch 'upstream/develop' into sam_raet_39 2014-05-16 15:30:32 -06:00
Samuel M Smith
36ce0bbc69 fixed logic bug in check_minion_cache 2014-05-16 15:21:34 -06:00
Samuel M Smith
0ce16b83c3 fixed tests to add auto field in SafeKeep
try using name instead of eid do remote key
2014-05-16 15:09:09 -06:00
Seth House
c5ed43c86c Merge pull request #12851 from rallytime/file_append_docs
Arg definitions added to states.file.append
2014-05-16 15:05:01 -06:00
Mike Place
85226a4dc2 Pylint 2014-05-16 15:00:34 -06:00
rallytime
1915dff8f9 Change lines to strings 2014-05-16 14:48:54 -06:00
Samuel M Smith
6eadb11215 delete key must be string 2014-05-16 14:42:01 -06:00
Samuel M Smith
6af40de8c5 persisting auto status 2014-05-16 14:32:34 -06:00
Mike Place
7dc4dbd3bb Better sysctl test detection.
Closes #12408
2014-05-16 14:16:50 -06:00
Joseph Hall
7d4d3fa4f2 Merge pull request #12852 from rallytime/pylint_fix
Pylint fix
2014-05-16 14:02:32 -06:00
rallytime
7b6126973a Pylint fix 2014-05-16 13:56:29 -06:00
Roger Steneteg
10a69dfa7d Fixed incorrect indentation 2014-05-16 21:33:20 +02:00
rallytime
8167493584 Arg definitions added to states.file.append 2014-05-16 13:25:11 -06:00
Roger Steneteg
40e1c1c67c Fixed whitespaces 2014-05-16 21:22:22 +02:00
Jason Mehring
b462864787 Added a _utils sync mechanism for distributing utility source files to minions (#12712) 2014-05-16 14:59:50 -04:00
Thomas S Hatch
cb4cd0f7a9 Merge pull request #12843 from eliasp/mount-keyerror
Don't rely blindly on the keys 'alt_device' and 'device_uuid'.
2014-05-16 12:06:24 -06:00
Colton Myers
bba613df27 Add note about `if_missing` to archive.extracted 2014-05-16 11:59:07 -06:00
Colton Myers
82c524d494 Ensure that freebsd service rc.conf ends in newline before appending 2014-05-16 11:51:54 -06:00
Colton Myers
44ec3f264d Add extra handling to highstate outputter for 'Comment' 2014-05-16 11:39:58 -06:00
Elias Probst
ce60e592cc Don't rely blindly on the keys 'alt_device' and 'device_uuid'.
This will cause failures on systems not providing these keys such as
FreeBSD.
2014-05-16 19:03:26 +02:00
Joseph Hall
283e5d4aff Merge pull request #12842 from rallytime/cloud_remove_pubkey
Remove unused pub_key kwarg from utils.cloud.check_auth
2014-05-16 10:09:02 -06:00
rallytime
f81deaae46 Remove pub_key from utils.cloud.check_auth 2014-05-16 10:05:36 -06:00
Roger Steneteg
02d2ef743f Added module and state for adding new firewall rules 2014-05-16 17:59:30 +02:00
Joseph Hall
940d88218a Merge pull request #12815 from makinacorpus/cloud
filter on profile & providers if any
2014-05-16 09:02:10 -06:00
Thomas S Hatch
e5d75ac416 Merge pull request #12838 from s0undt3ch/hotfix/transifex-updates
Update 'doc/.tx/config' - Build #54
2014-05-16 08:52:19 -06:00
Thomas S Hatch
455ca4f365 Merge pull request #12829 from terminalmage/yumpkg-reinstall
Refactor new yum reinstall support
2014-05-16 08:52:00 -06:00
Thomas S Hatch
9fc2b874ed Merge pull request #12823 from cachedout/12811
Detect lo as a valid loopback interface.
2014-05-16 08:51:41 -06:00
Thomas S Hatch
837ba1745d Merge pull request #12821 from rallytime/list_aliases
Make salt.states.target behave correctly with list of targets
2014-05-16 08:50:58 -06:00
Thomas S Hatch
56a701578e Merge pull request #12825 from cachedout/8367
Support returners in scheduler.
2014-05-16 08:49:48 -06:00
Thomas S Hatch
9522cb0e41 Merge pull request #12834 from internetstaff/develop
Fix Puppet module to work on Windows
2014-05-16 08:48:59 -06:00
Pedro Algarvio
0e5054e792 Update 'doc/.tx/config' - Build #54
http://cookingwithsalt.org/job/salt/job/transifex/54/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-05-16 15:00:19 +01:00
Pedro Algarvio
c6499cc502 Merge pull request #12824 from zeezooz/requisite_keywords
Add more requisites to STATE_INTERNAL_KEYWORDS.
2014-05-16 12:48:51 +01:00
Pedro Algarvio
11c03559e9 Merge pull request #12832 from whiteinge/salt-jinja-show-context
Added debugging helper function to Jinja to dump available context
2014-05-16 12:44:35 +01:00
rallytime
46f90298fb Pylint fixes 2014-05-15 20:05:08 -06:00
Cott Lang
a326a7a928 Fix Puppet module to work on Windows with community or enterprise Puppet packages installed. 2014-05-15 19:20:24 -06:00
Seth House
fd0cdfe4d6 Added debugging helper function to Jinja to dump available context 2014-05-15 17:26:40 -06:00
Cott Lang
066b2cd55a Fix Puppet module to work on Windows with community or enterprise Puppet packages installed. 2014-05-15 17:26:33 -06:00
Seth House
df3c788f05 Merge pull request #12822 from eliasp/rdp-2nd-fix
Correction for #12800.
2014-05-15 17:24:00 -06:00
Joseph Hall
b6fc023042 Merge pull request #12826 from zeezooz/iptables_out_interface
Correct iptables rule parameter.
2014-05-15 17:21:59 -06:00
rallytime
c9623c7cc2 Unit tests for aliases module 2014-05-15 16:51:44 -06:00
Erik Johnson
b1e27e9771 Refactor new yum reinstall support
This cleans up the new reinstall support that was merged yesterday.
2014-05-15 17:45:58 -05:00