Commit Graph

25638 Commits

Author SHA1 Message Date
Erik Johnson
9773caba98 Adjust docs to reflect additional hgfs changes 2014-02-08 13:23:54 -06:00
Erik Johnson
0cdb790efa Fix two more hgfs bugs
This fixes two additional hgfs bugs:

1. _get_ref() never looks at bookmarks, making it impossible to serve
   files using a bookmark as an environment.

2. Exceptions during a pull (in a fileserver update) will cause the
   update() function to abort, failing to clear the fileserver update
   lockfile. Thanks to a bitbucket outage for helping uncover this one!
2014-02-08 13:23:47 -06:00
Erik Johnson
ed2190b65e Add hgfs config params to docs 2014-02-08 05:25:07 -06:00
Erik Johnson
61f2c1a519 Add default values for hgfs_base 2014-02-08 05:24:24 -06:00
Erik Johnson
7dd3c4d65c Rewrite hgfs fileserver backend
This commit adds the optimizations recently added to gitfs to hgfs, and
also adds the hgfs_base parameter for feature parity.
2014-02-08 05:23:02 -06:00
Thomas S Hatch
9e968dd297 Clean up grain lookups from #10202 2014-02-07 22:15:21 -07:00
Thomas S Hatch
e937a85fe2 Add initial minion file for ioflo minion 2014-02-07 22:09:02 -07:00
Thomas S Hatch
0a43de249d whitespace 2014-02-07 22:09:02 -07:00
Thomas S Hatch
370f291a27 Merge pull request #10202 from Katafalkas/mdadm_module_config_
Basic mdadm.conf capability
2014-02-07 22:08:22 -07:00
Thomas S Hatch
ccc2515088 Merge pull request #10285 from s0undt3ch/hotfix/lint-and-formatting
Fix white-space related lint issues
2014-02-07 22:03:09 -07:00
Thomas S Hatch
1110838b81 Merge pull request #10283 from terminalmage/gitfs-dry-cleanup
Some DRY cleanup/error reporting improvement for gitfs
2014-02-07 22:02:11 -07:00
Thomas S Hatch
26ece483a0 Merge pull request #10277 from cachedout/pydsl_doc_import
More PyDSL documentation
2014-02-07 22:01:35 -07:00
Thomas S Hatch
93384381cd Merge pull request #10267 from cachedout/#9746
Compound commands partial fix
2014-02-07 21:40:14 -07:00
Thomas S Hatch
d05628029b Merge pull request #10266 from ticosax/bug-fix-previous-docker-id
In case of errors, iinfos['out'] is a string that contains the traceback
2014-02-07 21:36:59 -07:00
Thomas S Hatch
e4887ad891 Merge pull request #10264 from abique/patch-1
[pacman] don't reinstall if it is not needed
2014-02-07 21:34:57 -07:00
Thomas S Hatch
4e36e98757 Merge pull request #10254 from SmithSamuelM/sam_2014_02_03
Sam 2014 02 03
2014-02-07 21:26:32 -07:00
Thomas S Hatch
a407bb5cdc Merge pull request #10250 from cachedout/#9991
Match against lists in nested dicts in grains
2014-02-07 21:24:45 -07:00
Thomas S Hatch
a378e4c1da Merge pull request #10244 from cachedout/#10030
Minion log file 0600
2014-02-07 21:17:34 -07:00
Thomas S Hatch
b4bc256c2e Merge pull request #10242 from s0undt3ch/hotfix/lint
Start failing lint on unused imports
2014-02-07 21:14:37 -07:00
Pedro Algarvio
6967b2f801 Fix white-space related lint issues 2014-02-08 03:50:51 +00:00
Erik Johnson
f52dcd0402 Some DRY cleanup/error reporting improvement for gitfs
This commit does some DRY cleanup in the __virtual__ function, as well
as some of the provider verification code. In addition, it fixes a
couple minor aesthetic error reporting issues.
2014-02-07 21:48:21 -06:00
Pedro Algarvio
41f82b39e0 Merge pull request #10282 from s0undt3ch/develop
We need a bigger timeout, salt's repo is pretty big now.
2014-02-08 03:38:10 +00:00
Pedro Algarvio
fd306ea0b0 We need a bigger timeout, salt's repo is pretty big now. 2014-02-08 03:07:30 +00:00
David Boucha
bba617cc5a Merge pull request #10279 from russellballestrini/patch-1
Update runners index.rst
2014-02-07 18:45:37 -07:00
Russell Ballestrini
773e2f85ad Update runners index.rst
Adjusted the wording for accuracy.
2014-02-07 20:27:40 -05:00
Pedro Algarvio
58b1381f7c Merge pull request #10278 from s0undt3ch/develop
No need for the line breaks
2014-02-08 00:40:09 +00:00
Pedro Algarvio
bb9e431491 No need for the line breaks 2014-02-08 00:33:26 +00:00
Mike Place
4687bdabd4 Add documentation about inserting a Python module into the namespace
of a running PyDSL state.
2014-02-07 16:53:33 -07:00
Thomas S Hatch
3bf8e3f3d0 Fix #10223 2014-02-07 14:26:06 -07:00
Thomas S Hatch
5508307a27 Merge pull request #10204 from jhenry82/randomize_master_selection
Randomize master selection
2014-02-07 14:20:22 -07:00
Joseph Hall
cdc4bc6faf Merge pull request #10274 from kerick/aix-work
Fix cron module for AIX, Fix set_special documentation
2014-02-07 14:14:36 -07:00
Jayson Cofell
432d7bc640 Fix cron module for AIX, Fix set_special documentation 2014-02-07 15:03:50 -06:00
Mike Place
af6bfd9b4c Lint 2014-02-07 11:47:08 -07:00
Mike Place
4092d9ea11 Compound commands fix. 2014-02-07 11:41:44 -07:00
David Boucha
e67187ad79 Remove process.join()
This caused the windows minion to block
2014-02-07 11:17:46 -07:00
Pedro Algarvio
e2616596a8 Merge pull request #10265 from s0undt3ch/develop
Some more stalled job tweaks
2014-02-07 18:02:29 +00:00
Pedro Algarvio
c8010bbf4f We don't narrow check's to state calls no more. 2014-02-07 18:01:09 +00:00
Pedro Algarvio
420fe3cc50 Let's try without passing the --out option. 2014-02-07 18:00:40 +00:00
Alexandre Bique
ee29201175 [pacman] don't reinstall if it is not needed
Use the option --needed when installing packages to avoid re-installing a package if it is already at last version.
2014-02-07 18:50:06 +01:00
Nicolas Delaby
303972751d In case of errors, iinfos['out'] is a string that contains the traceback 2014-02-07 18:26:16 +01:00
Pedro Algarvio
b56278f083 Merge pull request #10256 from s0undt3ch/develop
Use the correct `.format()` index.
2014-02-07 10:26:31 +00:00
Pedro Algarvio
499a508a0f Use the correct .format() index. 2014-02-07 10:25:27 +00:00
Pedro Algarvio
5fd8776bb5 Start failing lint on unused imports 2014-02-07 10:24:59 +00:00
Samuel M Smith
149186e07a Refactored basic packet stuff to use classes and methods not funcs
More complete processing
2014-02-06 21:23:46 -07:00
Pedro Algarvio
9be06fe644 Merge pull request #10252 from plastikos/issue-10251
unit.modules.virtualenv_test.VirtualenvTestCase.test_python_argument
2014-02-07 01:08:15 +00:00
Pedro Algarvio
82cc018b67 Merge pull request #10253 from terminalmage/10245
Don't shadow built-in type 'list'
2014-02-07 01:07:41 +00:00
Erik Johnson
cc577ed6ab Don't shadow built-in type 'list' 2014-02-06 18:37:45 -06:00
Thayne Harbaugh
f9d790a389 unit.modules.virtualenv_test.VirtualenvTestCase.test_python_argument
work with non-standard interpreter locations

  Fixes #10251
2014-02-06 17:01:40 -07:00
Mike Place
aa8909b892 Don't lstrip(). Thanks @terminalmage for the reminder. 2014-02-06 16:46:15 -07:00
Mike Place
f9e890ae55 Nested dict recursion for subdict_match
This code needs some careful review because it's used in a bunch of places and this is a potentially substantial change. What we're doing here is to recurse back through the function if we encounter a dict that's an element of a list. This solves match against something like {'baz': [{'foo': 'bar}]} but it could have unintended side-effects that I haven't yet encountered. It supports matching against the sub-list-dict (just made that term up) either directly like 'baz:foo:bar' or 'baz:*:foo:bar'.

Comments welcome. Refs #9991.
2014-02-06 16:13:40 -07:00