Colton Myers
9805bdeddf
Merge pull request #27585 from lyft/cron-fix
...
Fix undefined variable in cron state module
2015-09-30 23:05:57 -06:00
Justin Findlay
87d86e4b3e
Merge pull request #27588 from jfindlay/2015.8
...
add autogenerated 2015.8.1 release notes
2015-09-30 22:52:31 -06:00
Justin Findlay
f2eb20f26b
add autogenerated 2015.8.1 release notes
2015-09-30 22:51:36 -06:00
Justin Findlay
f7510baf33
Merge pull request #27584 from jacobhammons/release-notes
...
added changes list to 2015.8.1 release notes
2015-09-30 22:32:47 -06:00
Ryan Lane
5474666b61
Fix undefined variable in cron state module
2015-09-30 17:25:06 -07:00
Jacob Hammons
ee4a3b3549
added changes list for 2015.8.1
2015-09-30 16:58:53 -06:00
Joseph Hall
1a31b19f15
Merge pull request #27575 from rallytime/fix-27532
...
Don't report existing instances as running only if they're actually terminated in EC2
2015-09-30 16:17:24 -06:00
Colton Myers
bee78a4e5c
Merge pull request #27573 from basepi/salt-ssh.grains.minion_opts.27290
...
[2015.8] Use the custom yaml serializer for minion_opts for salt-ssh
2015-09-30 15:16:22 -06:00
rallytime
57c6535fc2
Make sure message is the most accurate. Instance may be stopped or shutting down.
2015-09-30 14:27:07 -06:00
rallytime
da6b4b3604
Don't report existing instances as running only if they're actually terminated
...
Fixes #27532
2015-09-30 14:19:33 -06:00
Colton Myers
0785438b3f
Use the custom yaml serializer for minion_opts for salt-ssh
...
Without this change, any OrderedDict instances in our minion_opts (in
this case from grains) would be serialized to a format that
yaml.safe_load couldn't load. Configuration parsing would error out.
2015-09-30 13:58:54 -06:00
Colton Myers
a4a53ecff5
Merge pull request #27514 from clinta/2015.8-27326
...
Recent Versions of OpenSSL don't allow importing incomplete PEMs
2015-09-30 13:33:12 -06:00
jacobhammons
6cf0228adc
Merge pull request #27564 from jacobhammons/man-pages
...
Man pages
2015-09-30 13:29:37 -06:00
Jacob Hammons
cc37dc1087
updated version in salt.7
2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13
regenerated man pages for 2015.8.1
2015-09-30 12:58:34 -06:00
Clint Armstrong
515e62bfa7
change "None" to empty string
2015-09-30 14:41:55 -04:00
Mike Place
fd11e0cd95
Merge pull request #27522 from twangboy/fix_26629
...
Removed dependency on powershell to restart salt-minion
2015-09-30 10:19:29 -06:00
C. R. Oldham
eb76531e96
Merge pull request #27550 from rallytime/cloud-logging
...
[2015.8] Clean up salt-cloud logging and make it more useful
2015-09-30 09:48:53 -06:00
Mike Place
1f7ea7c764
Merge pull request #27517 from jacobhammons/install-docs
...
Updated install docs
2015-09-30 09:19:51 -06:00
Mike Place
2a4c11ae24
Merge pull request #27526 from eliasp/2015.8-modules.slack_notify-doc-params
...
Add missing newlines before param listing to fix doc rendering
2015-09-30 09:19:04 -06:00
Nicole Thomas
e5de9409c2
Merge pull request #27525 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-29 21:38:22 -06:00
rallytime
9e0fccd543
Don't commit private-ip changes from testing another bug...
2015-09-29 21:28:59 -06:00
rallytime
78c85fbb31
Add unit tests for new recursive function
2015-09-29 21:25:47 -06:00
rallytime
d9a2dc6bc5
[2015.8] Clean up salt-cloud logging and make it more useful
2015-09-29 19:38:38 -06:00
Colton Myers
1f3eb1c526
Remove useless mocked unit test
2015-09-29 18:23:46 -06:00
Elias Probst
204e66943f
Add missing newlines before param listing to fix doc rendering
2015-09-29 23:33:49 +02:00
twangboy
163c54505d
Fixed tests... hopefully
2015-09-29 15:28:23 -06:00
twangboy
dc8c01ed07
Fixed some lint
2015-09-29 15:19:19 -06:00
Colton Myers
73b90f155e
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/gce.rst
doc/topics/windows/windows-package-manager.rst
salt/client/ssh/state.py
salt/cloud/clouds/ec2.py
salt/modules/defaults.py
salt/modules/file.py
salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Jacob Hammons
167fd2304e
Fixed a duplicated link ID
2015-09-29 14:08:48 -06:00
twangboy
2cb0f12696
Removed dependency on powershell to restart salt-minion
...
Fixes : #26629
Used net stop && net start instead of a powershell command to restart the
salt-minion service.
2015-09-29 14:01:10 -06:00
Justin Anderson
0e37fb3bd3
Merge pull request #27513 from terminalmage/fix-worktree-tests
...
Fix integration tests for worktree addition in git >= 2.6
2015-09-29 12:39:19 -06:00
Nicole Thomas
e974a3c8aa
Merge pull request #27510 from rallytime/ryan-lane-test-fix
...
Merge #27475 with test fixes
2015-09-29 12:34:32 -06:00
Jacob Hammons
c05fa71f91
Updated install docs
...
Refs #27281
Refs #27179
2015-09-29 12:07:50 -06:00
Colton Myers
6d773f66c3
Merge pull request #27516 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-09-29 11:53:33 -06:00
Colton Myers
a08951f0fa
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/utils/cloud.py
2015-09-29 11:52:32 -06:00
Clint Armstrong
2989f24169
fix 27326 and fix minor errors in docs.
2015-09-29 13:29:36 -04:00
Erik Johnson
519bdd6438
Fix integration tests for worktree addition in git >= 2.6
...
The output from 'git worktree add' changed slightly in 2.6.
2015-09-29 12:01:45 -05:00
rallytime
cae2c4e715
Syntax fix
2015-09-29 10:02:16 -06:00
rallytime
458547ba03
Fix test failures for boto __state__ changes
2015-09-29 09:55:44 -06:00
Mike Place
d85b0cbd69
Merge pull request #27451 from ticosax/dockerng-host-config-support
...
[dockerng] Enforce usage of host_config and require docker-py>=1.4.0
2015-09-29 09:51:28 -06:00
Mike Place
e8f58a6a3f
Merge pull request #27461 from cachedout/clean_context_ioloop
...
Only clean context if it exists
2015-09-29 09:49:52 -06:00
Mike Place
68d784c3dd
Merge pull request #27472 from cachedout/fix_27447
...
Change recommeded schema for data field in mysql event table
2015-09-29 09:49:37 -06:00
Mike Place
ee6e0ed057
Merge pull request #27468 from cachedout/fix_27351
...
Fix 27351
2015-09-29 09:35:29 -06:00
Mike Place
a214c7f84e
Merge pull request #27479 from aboe76/fix_locale_suse
...
fix locale on opensuse and suse #27438
2015-09-29 09:34:48 -06:00
Mike Place
25a30a5621
Merge pull request #27473 from terminalmage/issue27220
...
salt.utils.gitfs: Don't use close_fds=True on Windows
2015-09-29 09:34:03 -06:00
Mike Place
931f593b51
Merge pull request #27483 from rallytime/fix-17103
...
Outputters should sync to output, not outputters, on the minion.
2015-09-29 09:33:08 -06:00
Mike Place
9c2c028953
Merge pull request #27484 from rallytime/bp-27434-and-27470
...
Back-port #27434 and #27470 to 2015.5
2015-09-29 09:32:03 -06:00
Mike Place
3807cd5c4e
Merge pull request #27496 from blueyed/fix-gitpython-version
...
Fix version reporting of gitpython
2015-09-29 09:31:48 -06:00
Erik Johnson
057fd0729d
Merge pull request #27502 from ticosax/backport-test-from-develop
...
Add test to check we don't call inspect_image on absent images.
2015-09-29 10:15:09 -05:00
