Jack Kuan
5ad5cd9b6e
Fix a bug in the pydsl test case.
2013-01-21 10:27:06 -05:00
Thomas S Hatch
a427501321
remove aptsources from travis yaml file
2013-01-21 00:09:35 -07:00
Thomas S Hatch
a8cbcd861f
Merge branch 'develop' of git://github.com/morganfainberg/salt into aptrepo
2013-01-21 00:08:42 -07:00
Thomas S Hatch
62aabd4999
spacing keeps goign odd here...
2013-01-21 00:02:56 -07:00
Thomas S Hatch
ec05e5fa7d
It appears to be python-aptsources
2013-01-20 23:59:47 -07:00
Morgan Fainberg
86ee45ff9b
Wrap python-apt module imports in try/except
...
This is done to make sure pkg module can load and function
in the case the python-apt and python-apt-common modules
are not present. This however will disable the new
repo management functionality.
2013-01-21 06:58:29 +00:00
Thomas S Hatch
ce4f111184
Python apt is already installed
2013-01-20 23:57:46 -07:00
Thomas S Hatch
8da64f3a09
Failing virtual functions should not log warrnings
...
Fix #3350
2013-01-20 23:48:10 -07:00
Thomas S Hatch
428085424f
fix yaml spacing in travis config
2013-01-20 23:46:18 -07:00
Thomas S Hatch
8f2ad69362
Add python-apt deps for Travis builds
2013-01-20 23:31:14 -07:00
Thomas S Hatch
63261c158e
Merge pull request #3345 from giantlock/develop
...
fix pkg.latest bugs
2013-01-20 22:11:37 -08:00
Denis Generalov
d7be42366f
use special compare method for package versions
2013-01-21 10:10:15 +04:00
Thomas S Hatch
3f94e1573f
The module state should only return changes if the function call
...
returns positive data
2013-01-20 21:51:29 -07:00
Thomas S Hatch
fdf3978166
Fix #3340
2013-01-20 21:38:42 -07:00
Thomas S Hatch
99172816ea
Merge pull request #3329 from mjarco/fix-config-options-defaults
...
Default options were never returned if omit_pillar flag was set to false (or unset)
2013-01-20 20:17:39 -08:00
David Boucha
8551e410c8
Merge pull request #3348 from techhat/nfs
...
Adding initial nfs execution module
2013-01-20 17:44:52 -08:00
Joseph Hall
992e8b22cc
Adding initial nfs execution module
2013-01-20 18:32:35 -07:00
Joseph Hall
44de56344c
Merge pull request #3347 from morganfainberg/apt-repo-management
...
Basic apt-repo management functionality
2013-01-20 14:32:11 -08:00
Morgan Fainberg
f27fb52d6b
Basic apt-repo management functionality
...
Added in the core functionality needed to manage apt-based repos.
The only downside is that due to the way apt works, most of the
interfacing requires utilizing the formatted repo_str. This is
because the formats can vary some depending on specifics.
Support for the format "ppa:<project>/repo" has also been added
provided that the python libraries are installed.
This is all done via the python-bindings for apt, rather than calling
out to the "aptitude" or "apt-get" binaries (since the bindings have
some validation in them).
Minor modification of pkrepo state to detect when repos are already
configured (instead of configuring them every time). Also improved
"changes" output for modified repos
2013-01-20 22:01:03 +00:00
Denis Generalov
433df06175
fix pkg.latest bugs
2013-01-20 22:00:04 +04:00
Thomas S Hatch
7ff010e75a
Merge pull request #3344 from ydavid365/patch-4
...
added simpler rhel5/6 examples for starting salt / loading at boot.
2013-01-20 00:22:20 -08:00
John Albietz
f4ada25d4c
updated with rhel6 examples for starting / loading at boot.
2013-01-20 00:18:45 -08:00
John Albietz
f448591b38
updated with rhel6 examples for starting / loading at boot.
2013-01-20 00:16:22 -08:00
Thomas S Hatch
9871218511
Merge pull request #3343 from ydavid365/patch-3
...
additional example for multiple target types.
2013-01-20 00:11:02 -08:00
John Albietz
11125d41e4
additional example for multiple target types.
2013-01-20 00:08:39 -08:00
Thomas S Hatch
c291904a80
Remove clean up of push socket in publisher to fix race condition
...
The clean up was causing an inconsistency in the pull socket,
this will need some more refinement, but for now the problem is
fixed
2013-01-20 00:55:16 -07:00
Thomas S Hatch
080ddf14c2
Merge pull request #3338 from kjkuan/develop
...
pydsl doc updates
2013-01-19 22:29:01 -08:00
Jack Kuan
e37ad858f9
add pydsl renderer doc.
2013-01-20 01:22:16 -05:00
Jack Kuan
897f877bed
Added docs for pydsl and fixed a syntax inconsistency.
2013-01-20 01:21:05 -05:00
Thomas S Hatch
b945f64236
Merge pull request #3337 from s0undt3ch/develop
...
`client_config` should also support receiving it's own defaults.
2013-01-19 21:55:22 -08:00
Pedro Algarvio
067b7f034a
client_config should also support receiving it's own defaults.
2013-01-20 05:53:01 +00:00
Pedro Algarvio
3febceeefc
default_include should also be checked against provided defaults.
2013-01-20 05:21:44 +00:00
Thomas S Hatch
4cfed31cbe
Fix some of the formatting and use a stock grain so people don't
...
go looking for a non standard grain
2013-01-19 22:15:24 -07:00
Thomas S Hatch
379cd70bf0
Merge pull request #3336 from ydavid365/patch-1
...
updated to add an example of other standard top matching types in pillar...
2013-01-19 21:12:37 -08:00
John Albietz
f6d2914542
updated to add an example of other standard top matching types in pillar files.
...
Not sure if you'll like my example, but we should add at least one example of how to use other standard top matching types into the top.sls file.
2013-01-19 21:04:22 -08:00
Thomas S Hatch
8ed0a4e224
Merge pull request #3335 from s0undt3ch/develop
...
Number of commits is not limited to 2 chars.
2013-01-19 20:19:17 -08:00
Pedro Algarvio
9821022cb3
Number of commits is not limited to 2 chars.
2013-01-20 04:17:41 +00:00
Thomas S Hatch
d9b1997c30
Merge pull request #3334 from s0undt3ch/develop
...
Fix `tests.unit.pydsl_test` and `tests.unit.stateconf_test`.
2013-01-19 20:12:23 -08:00
Pedro Algarvio
3629fe88c0
Fix tests.unit.pydsl_test and tests.unit.stateconf_test.
...
No more errors are shown because the configuration files are not readable, and in fact, the minion configuration can be use, unlike what was said in the comment.
2013-01-20 04:09:07 +00:00
Pedro Algarvio
2686cb6195
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-01-20 03:51:52 +00:00
Pedro Algarvio
69b8aa83f4
Typo correction.
2013-01-20 03:51:09 +00:00
Thomas S Hatch
7359da8a8e
Merge pull request #3333 from s0undt3ch/develop
...
Allow providing the defaults dictionary to override.
2013-01-19 19:35:25 -08:00
Pedro Algarvio
b4e1dbac7d
Allow providing the defaults dictionary to override.
2013-01-20 03:31:11 +00:00
Thomas S Hatch
fe6c04881f
Merge pull request #3332 from s0undt3ch/develop
...
Some more external sub-classing and code re-use support
2013-01-19 19:20:30 -08:00
Pedro Algarvio
a739a07378
Protect against the log_path being set to None.
2013-01-20 03:16:07 +00:00
Pedro Algarvio
6f8183090e
Allow providing the environment variable to load configuration from.
...
Now, `config_master`, `config_minion` and `client_config` accept the proper environment variable to load configuration from. This allows projects sub-classing salt's master and minion, for example, to provide their own environment variable.
2013-01-20 03:12:23 +00:00
Thomas S Hatch
86ed822148
Single quotes
2013-01-19 18:22:54 -07:00
Michał Jarco
77f898b0cb
Simplistic tests (still better than none)
2013-01-19 15:02:06 +01:00
Michał Jarco
e05cc0c10d
Default options were never returned if omit_pillar flag was set to false
2013-01-19 13:31:49 +01:00
Thomas S Hatch
2a3ac0b7c9
Remove config util module
2013-01-19 00:13:37 -07:00
