Mike Place
|
679dc089c0
|
Merge pull request #26275 from cachedout/mm_reinit
Re-init modules on multi-master reconnect
|
2015-08-13 09:52:50 -06:00 |
|
Nicole Thomas
|
75fff28779
|
Merge pull request #26273 from garethgreenaway/2015_5_schedule_list_show_jobs_enabled
Fixes to schedule module in 2015.5
|
2015-08-13 09:34:42 -06:00 |
|
Joseph Hall
|
10af22775a
|
Merge pull request #26271 from rallytime/fix-24483
Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2
|
2015-08-12 17:22:47 -06:00 |
|
Mike Place
|
1e0473c04a
|
Re-init modules on multi-master reconnect
|
2015-08-12 16:08:23 -06:00 |
|
Gareth J. Greenaway
|
1aad4b1b4f
|
Jobs are enabled by default but schedule.list does not show an enabled jobs as being enabled by default. This change fixes that.
|
2015-08-12 14:19:05 -07:00 |
|
rallytime
|
139fbb93bc
|
Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2
Fixes #24483
|
2015-08-12 14:57:07 -06:00 |
|
Mike Place
|
8e1b5da2e0
|
Merge pull request #26219 from alprs/fix-cron_identifier_default
cron: make identifier default to state ID
|
2015-08-12 12:42:33 -06:00 |
|
Mike Place
|
eebcade533
|
Merge pull request #26257 from rallytime/bp-26237
Back-port #26237 to 2015.5
|
2015-08-12 12:40:35 -06:00 |
|
Mike Place
|
d7c8169dfb
|
Merge pull request #26258 from nmadhok/fix-permission
Fix permission on tests/runtests.py on 2015.5 branch
|
2015-08-12 12:40:03 -06:00 |
|
Nicole Thomas
|
74b70c37b7
|
Merge pull request #26261 from nmadhok/doc-fix-2015.5
Correct spelling of integration in docs
|
2015-08-12 12:14:47 -06:00 |
|
Nitin Madhok
|
714f9766e7
|
Correct spelling of integration in docs
|
2015-08-12 13:30:03 -04:00 |
|
Nitin Madhok
|
d94485d336
|
Fix permission on tests/runtests.py on 2015.5 branch
|
2015-08-12 13:04:17 -04:00 |
|
rallytime
|
d57fdbc6a0
|
Add versionadded to new members function
|
2015-08-12 11:04:09 -06:00 |
|
Julien Cigar
|
dad1920626
|
fix issue #26207
|
2015-08-12 11:02:46 -06:00 |
|
Nicole Thomas
|
de00c181f8
|
Merge pull request #26247 from nmadhok/vmware-cloud-test-2015.5
Initial commit of unit tests for vmware cloud driver
|
2015-08-12 10:58:24 -06:00 |
|
Nicole Thomas
|
d14d7b2c0e
|
Merge pull request #26246 from nmadhok/vmware-cloud-driver-additions-2015.5
Backport additions to VMware cloud driver from develop to 2015.5 branch
|
2015-08-12 09:11:26 -06:00 |
|
Nicole Thomas
|
87b300d7b3
|
Merge pull request #26239 from Unity-Technologies/2015.5
Fixed documentation to match function name
|
2015-08-12 08:48:52 -06:00 |
|
Nitin Madhok
|
6cc5f97e92
|
Lint Fix
|
2015-08-12 10:47:49 -04:00 |
|
Nitin Madhok
|
a8bfe5ec1f
|
Initial commit of unit tests for vmware cloud driver
|
2015-08-12 10:30:14 -04:00 |
|
Nitin Madhok
|
5227aa94bc
|
Backport additions to VMware cloud driver from develop to 2015.5 branch
|
2015-08-12 10:16:35 -04:00 |
|
Daniel Hobley
|
fc18751710
|
Fixed documentation to match function name
|
2015-08-12 13:57:31 +02:00 |
|
Andreas Lutro
|
1f02e1671b
|
cron: fix a typo in the tests
|
2015-08-12 10:08:43 +02:00 |
|
Andreas Lutro
|
a86b1b7f94
|
add release note about cron state changes
|
2015-08-12 10:07:02 +02:00 |
|
Andreas Lutro
|
9511e392ce
|
cron: read full length of multi-line comments
|
2015-08-12 10:06:59 +02:00 |
|
Andreas Lutro
|
9b18cd9050
|
cron: more descriptive tests, updated to reflect new behavior
|
2015-08-12 10:06:53 +02:00 |
|
Andreas Lutro
|
f22ad837c3
|
cron: change identifier default value to False
this allows the user to set it explicitly to None if they want to
manage a cronjob with no identifier. realistically, this is probably
a rare usecase.
|
2015-08-12 10:06:51 +02:00 |
|
Andreas Lutro
|
ad444b6e7b
|
cron identifier: default to state id
|
2015-08-12 10:06:45 +02:00 |
|
Justin Findlay
|
a93b96c9ba
|
Merge pull request #26232 from garethgreenaway/2015_5_gpg_trust_key_fix
Fix to trust_key in gpg module for 2015.5.
|
2015-08-11 22:48:27 -06:00 |
|
Gareth J. Greenaway
|
e174c41887
|
Fix to trust_key in gpg module for 2015.5.
|
2015-08-11 20:57:09 -07:00 |
|
Mike Place
|
b57da552ff
|
Merge pull request #26084 from twangboy/fix_25802
Added python_shell=True, quoted user input
|
2015-08-10 15:29:35 -06:00 |
|
twangboy
|
4503ed5b34
|
Fixed but with multiple packages, was causing tests to fail
|
2015-08-10 13:36:53 -06:00 |
|
twangboy
|
f05e3e72a3
|
Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25802
|
2015-08-10 13:36:02 -06:00 |
|
Mike Place
|
c3814137a3
|
Merge pull request #26183 from cro/anonldap2
Fix LDAP configuration issue.
|
2015-08-10 13:09:41 -06:00 |
|
Justin Findlay
|
3233ed4675
|
Merge pull request #26186 from jacobhammons/man-page-updates
regenerated man pages
|
2015-08-10 13:07:44 -06:00 |
|
Justin Findlay
|
d48bcf7598
|
Merge pull request #26182 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
|
2015-08-10 13:00:10 -06:00 |
|
Mike Place
|
f39780f8ce
|
Merge pull request #26000 from driskell/fix_discarded_events
Implement full event caching for subscribed tags
|
2015-08-10 12:57:17 -06:00 |
|
C. R. Oldham
|
aa5e9c80b5
|
Lint roller
|
2015-08-10 12:53:23 -06:00 |
|
Mike Place
|
c01b4cf150
|
Merge pull request #26175 from rallytime/bp-26153
Back-port #26153 to 2015.5
|
2015-08-10 12:22:32 -06:00 |
|
Mike Place
|
ca80f33bfd
|
Merge pull request #26177 from rallytime/bp-26147
Back-port #26147 to 2015.5
|
2015-08-10 12:22:01 -06:00 |
|
Mike Place
|
1213b8d706
|
Merge pull request #26179 from rallytime/bp-25404
Back-port #25404 to 2015.5
|
2015-08-10 12:21:50 -06:00 |
|
Mike Place
|
b319c5ec04
|
Merge pull request #26180 from jfindlay/templ_env
fix processing of state.template
|
2015-08-10 12:21:38 -06:00 |
|
Jacob Hammons
|
bf2dad913f
|
regenerated man pages
|
2015-08-10 11:49:53 -06:00 |
|
C. R. Oldham
|
79833e3f8a
|
Cherry pick index.rst change.
|
2015-08-10 10:59:16 -06:00 |
|
C. R. Oldham
|
99f2c27399
|
Documentation update for anonymous bind issue.
|
2015-08-10 10:58:29 -06:00 |
|
C. R. Oldham
|
793eed7b96
|
Cherry pick master.py groups check
|
2015-08-10 10:58:05 -06:00 |
|
Colton Myers
|
32f5345d7d
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
conf/minion
doc/conf.py
salt/modules/file.py
|
2015-08-10 10:56:40 -06:00 |
|
Justin Findlay
|
5e46ea4441
|
check type of matches in render_state before iterating
Fixes #26112.
|
2015-08-10 10:50:07 -06:00 |
|
Justin Findlay
|
c80299b918
|
insert saltenv to render_state args in state.template
|
2015-08-10 10:50:07 -06:00 |
|
Dmitry Kuzmenko
|
52ab9fc1fb
|
Fixed minion failover to next master on DNS errors.
|
2015-08-10 10:49:22 -06:00 |
|
Martin Hoefling
|
323c3ab53c
|
Fixes #26024
|
2015-08-10 10:44:44 -06:00 |
|