Chris Rebert
e5d56fc7fe
fix #13300 by removing redundant import of random.shuffle()
2014-06-09 15:15:20 -07:00
Warren Turkal
6cd4981525
Allow schedules to work in multimaster.
...
This change allows schedules to work in multimaster. I've had to revert to a single master config for now since 2014.1.4 (the latest EPEL version) contains this bug.
I did try this with a single master setup. It does appear to work.
The code in the develop version looks very similar and may be similarly broken.
2014-06-09 14:39:34 -06:00
Thomas S Hatch
e41db8a5c7
Merge pull request #13337 from garethgreenaway/reload_schedule
...
Adding the ability to reload scheduled jobs from the saved schedule file
2014-06-09 13:34:06 -06:00
Thomas S Hatch
861b9cd534
Merge pull request #13334 from cachedout/13328
...
Don't decrypt twice
2014-06-09 13:30:40 -06:00
Thomas S Hatch
45c2ea470f
Merge pull request #13333 from gtmanfred/contents_grains
...
Add contents_grains
2014-06-09 13:28:49 -06:00
Thomas S Hatch
0792e20d6c
Merge pull request #13331 from terminalmage/fix-docs-build-errors
...
Fix docs build errors
2014-06-09 13:26:05 -06:00
Thomas S Hatch
7160e8d3c5
Merge pull request #13322 from terminalmage/docs
...
Add reactor example for syncing custom types on initial highstate
2014-06-09 13:19:21 -06:00
Gareth J. Greenaway
eb637ae03e
fixing lint issue
2014-06-09 11:05:30 -07:00
Gareth J. Greenaway
c56a4e0bb6
Adding the ability to reload scheduled jobs from the saved schedule file.
2014-06-09 10:15:36 -07:00
Mike Place
d626d8a37b
Don't decrypt twice
...
According to #13328 , the minion was stacktracing on state but
operating normally after that.
I believe this problem may have originated in the channel-reuse
changes in #13155 . It appears that the intention there may have
been to move the crypt functionality into the transport, which
would make it unecessary in the minion method itself. (Please
correct me if I'm wrong, of course. I'm making an assumption here.)
At any rate, this removes that duplicate functionality, thus
eliminating the stack trace.
2014-06-09 10:40:10 -06:00
Thomas S Hatch
3493c50f8e
Merge pull request #13318 from garethgreenaway/13293
...
Fixing issue with holding and unholding packages where sources are specified
2014-06-09 10:33:58 -06:00
Erik Johnson
51f026be03
Merge pull request #13316 from jond64/pkg.installed-add-pkg_verify
...
Pkg.installed add pkg verify
2014-06-09 11:11:29 -05:00
Erik Johnson
2382ced37b
Add versionadded directive
2014-06-09 11:09:26 -05:00
Erik Johnson
a628a178cb
Fix underline length mismatch
2014-06-09 11:07:53 -05:00
Erik Johnson
231aa4c5af
Add target text for link
2014-06-09 11:07:17 -05:00
Erik Johnson
126c97a008
Alphabetically sort list of clouds
2014-06-09 11:06:32 -05:00
Erik Johnson
38c1690310
Remove reference to nonexistant page
2014-06-09 11:06:06 -05:00
Erik Johnson
a61812ce6f
Clean up new master_type feature docs
2014-06-09 11:05:10 -05:00
Erik Johnson
50bc3f7a2c
Add aliyun to toctree
2014-06-09 11:04:31 -05:00
jond64
2f56cce26d
Merge pull request #1 from terminalmage/pull13316
...
Add versionadded directive
2014-06-09 10:29:01 -05:00
Daniel Wallace
fc4fe4972e
Add contents_grains
...
Also rename contents_pillar_newline to contents_newline, and to work
with all contents directives.
2014-06-09 10:23:14 -05:00
Erik Johnson
aa813b38e5
Add versionadded directive
2014-06-09 09:50:21 -05:00
Erik Johnson
cf7f06f8f9
Remove duplicate word
2014-06-09 01:49:09 -05:00
Erik Johnson
f74febd6a8
Merge pull request #13327 from garethgreenaway/11859_add_flag_to_aptpkg_for_upgrade
...
Added the ability to aptpkg.upgrade to use the apt-get upgrade opition instead of dist-upgrade
2014-06-08 20:43:36 -05:00
Gareth J. Greenaway
e25d6a3ade
lint issues
2014-06-08 10:07:23 -07:00
Gareth J. Greenaway
714f03101c
Added the ability to aptpkg.upgrade to use the upgrade opition with apt-get instead of the dist-upgrade method. Introducing a new argument to the upgrade function, dist-upgrade, which is True by default but can be set to False to use upgrade.
2014-06-08 09:36:01 -07:00
Erik Johnson
3ca776a167
Add reactor example for syncing custom types on initial highstate
2014-06-07 14:27:26 -05:00
Gareth J. Greenaway
199b6ac4ba
Fixing issue with holding and unholding packages where sources are specified instead of pkgs.
2014-06-07 10:49:33 -07:00
jond64
9075318f4d
Fixed pylint violations
2014-06-07 11:33:57 -05:00
jond64
632f5546d3
Add rpm verify option to pkg.installed state
2014-06-07 10:48:27 -05:00
jond64
3fb733da1e
Add rpm verify option to pkg.installed state
2014-06-07 10:42:24 -05:00
Joseph Hall
2b8d232130
Merge pull request #13315 from s0undt3ch/features/bootstrap-script-arguments
...
Make use of the `bootstrap.saltstack.com` URL(s)
2014-06-07 07:01:44 -06:00
Pedro Algarvio
506cbe4726
Make use of the bootstrap.saltstack.com URL(s)
2014-06-07 13:59:39 +01:00
Pedro Algarvio
e4591c4e27
Remove unnecessary comma
2014-06-07 13:53:02 +01:00
Pedro Algarvio
7750b2bff2
Merge pull request #13314 from s0undt3ch/develop
...
Provide a way to specify which minion version is bootstrapped
2014-06-07 13:11:52 +01:00
Pedro Algarvio
31a997e994
Provide a way to specify which minion version is bootstrapped
...
NOTE: This does not change which version is tested
2014-06-07 13:06:09 +01:00
jond64
f5ea23bc74
Add rpm verify option to pkg.installed state
2014-06-07 02:54:46 -05:00
jond64
a34c6a86ad
Add rpm verify option to pkg.installed state
2014-06-07 00:04:19 -05:00
Joseph Hall
83876510a2
Merge pull request #13310 from s0undt3ch/hotfix/links
...
Fixing broken links and updating them to ones that work
2014-06-06 21:23:00 -06:00
Joseph Hall
e92763616e
Merge pull request #13270 from khrisrichardson/etcd_mods
...
optionally get etcd vals from master, squash stack traces, and fix lint ...
2014-06-06 21:17:56 -06:00
Khris Richardson
1bf20759a2
unify return types
2014-06-06 21:13:11 -05:00
jond64
74f9040130
Add rpm verify option to pkg.installed state
2014-06-06 20:33:20 -05:00
nmadhok
a3f8cead8a
Fixing broken links and updating them to ones that work
2014-06-07 00:44:21 +01:00
Thomas S Hatch
3abc743514
Merge pull request #13308 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #75
2014-06-06 16:34:11 -06:00
Thomas S Hatch
482c6a0097
Merge pull request #13307 from cachedout/12289
...
Catch invalid proc files
2014-06-06 16:33:50 -06:00
Pedro Algarvio
ecad55409a
Update 'doc/.tx/config' - Build #75
...
http://cookingwithsalt.org/job/salt/job/transifex/75/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-06-06 23:09:16 +01:00
jond64
53c639ca85
Add rpm verify option to pkg.installed state
2014-06-06 17:07:23 -05:00
Mike Place
029d5f3d34
Catch invalid proc files
...
Also some cleanup and linting.
Closes #12289
2014-06-06 15:57:01 -06:00
Thomas S Hatch
3490f5c5e7
Merge pull request #13304 from garethgreenaway/13293
...
Fixes to module yumpkg.py and state pkg.py
2014-06-06 15:46:42 -06:00
Gareth J. Greenaway
2476f0d16c
Fixes to module yumpkg.py and state pkg.py to prevent exceptions when yum-plugin-versionlock is not installed and packages are attempted to be held.
2014-06-06 14:45:40 -07:00
