valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,730 Commits 24 Branches 182 Tags 341 MiB
6922da46dc
Commit Graph

59730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
b5b80b9324 Merge pull request #29597 from terminalmage/issue29584 
dockerng: Prevent exception when API response contains empty dictionary
 2015-12-10 12:57:42 -07:00
Mike Place
ffb54cced7 Merge pull request #29596 from rallytime/bp-29587 
Back-port #29587 to 2015.8
 2015-12-10 12:57:18 -07:00
Mike Place
a04280ceb3 Re-raise error to preserve restart behavior 2015-12-10 12:54:05 -07:00
Colton Myers
2bdcadaa27 Remove unnecessary and 2015-12-10 12:29:18 -07:00
Colton Myers
501f91a388 Fix error in failure checking for salt.state within orchestration 2015-12-10 12:22:17 -07:00
Mike Place
dc480e332a Clean up warning on failed master ping. 2015-12-10 12:02:54 -07:00
Mike Place
049a3dbbbc Additional fixes. 
Better detection of schedule init, handle failed beacons and remove unnedeed debug statements.
 2015-12-10 11:55:16 -07:00
Mike Place
8a4969b730 Clean up minion shutdown 
Also cleaner logging for cases where the master could not be contacted.
 2015-12-10 10:51:48 -07:00
Erik Johnson
d68067b5db dockerng: Prevent exception when API response contains empty dictionary 
Fixes #29584.
 2015-12-10 10:38:30 -06:00
Job Snijders
bfb75ce363 Fix the 'cidr' arg in salt.modules.network.ip_addrs6() 
The two arguments to ip_in_subnet() should be swapped around, but
since ip_in_subnet() is being deprecated in favor of in_subnet(),
removing three characters seemed like the most appropiate bugfix.

This fixes #29585
 2015-12-10 09:31:19 -07:00
Mike Place
08dd663a27 Merge pull request #29588 from rallytime/esxi-proxy-tutorial 
Added ESXi Proxy Minion Tutorial
 2015-12-10 09:17:51 -07:00
rallytime
5a2bb260d3 Added ESXi Proxy Minion Tutorial 
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
 2015-12-09 18:00:20 -07:00
Mike Place
fe5db23863 Merge pull request #29572 from gtmanfred/2015.8 
[nova] use old discover_extensions if available
 2015-12-09 10:35:42 -07:00
Daniel Wallace
d0ffa520f4 use old discover_extensions if available 
This was moved in 2.24.0, but this should work for everything back to 2.6.1

Closes #29557
 2015-12-09 10:42:44 -06:00
Mike Place
ecbc60ba05 Merge pull request #29545 from terminalmage/issue29009 
git.latest: init submodules if not yet initialized
 2015-12-09 09:19:42 -07:00
Mike Place
3b2c93a2e5 Merge pull request #29548 from rallytime/bp-29449 
Back-port #29449 to 2015.8
 2015-12-09 09:19:07 -07:00
Mike Place
fd67903bf9 Merge pull request #29547 from rallytime/esxi-proxy 
Refactored ESXCLI-based functions to accept a list of esxi_hosts
 2015-12-09 09:08:03 -07:00
Mike Place
21437f9235 Merge pull request #29563 from alprs/fix-influx_deprecated_method 
Fix a call to deprecated method in python-influxdb
 2015-12-09 09:00:24 -07:00
Mike Place
f29e0a7021 Merge pull request #29565 from bdrung/2015.8 
Fix typos and missing release note
 2015-12-09 08:59:20 -07:00
Andreas Lutro
7c69c177ed update test 2015-12-09 13:18:47 +01:00
Andreas Lutro
46d7d92069 fix a call to deprecated method in python-influxdb 
1da39bf860/influxdb/influxdb08/client.py (L543-L553)
 2015-12-09 13:16:10 +01:00
Joe Healy
b96d8ff1d9 Minor update to release notes for missing fix 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4 Fix typo specfic -> specific 2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762 Fix typo comparsion -> comparison 2015-12-09 12:17:49 +01:00
Akhter Ali
3715cd7d65 Adding message for null public IP 2015-12-08 17:18:18 -07:00
rallytime
469648dd07 Refactored ESXCLI-based functions to accept a list of esxi_hosts 
Previously, only one esxi_host could be passed in when connecting
to a vCenter server. This brings feature-partiy for ESXCLI-based
functions with pyVmomo-based functions, which already accept and
handle a list of hosts.

State functions were also updated.

Also fixes a bug with the ESXCLI which check in salt.utils.vmware
and provides default protocol and port options if none are provided.
 2015-12-08 17:09:13 -07:00
Erik Johnson
6619503aec git.latest: init submodules if not yet initialized 
Fixes #29009.
 2015-12-08 17:45:50 -06:00
Mike Place
25d3a75d8c Merge pull request #29540 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-12-08 14:27:01 -07:00
Mike Place
3ae096b7ac Merge pull request #29499 from rallytime/esxi-proxy 
Initial commit of ESXi Proxy Minion
 2015-12-08 14:10:13 -07:00
Mike Place
873f6a9460 Merge pull request #29526 from jfindlay/2015.8 
2015.8.2 notes: add note about not being released
 2015-12-08 14:09:50 -07:00
Mike Place
f77c8e7baf Merge pull request #29527 from jfindlay/2015.5 
2015.5.7 notes: add note about not being released
 2015-12-08 14:08:26 -07:00
Mike Place
3de61e3655 Merge pull request #29531 from jfindlay/suse_patch 
grains.core: handle undefined variable
 2015-12-08 14:07:37 -07:00
Colton Myers
1d8014411a Merge pull request #29538 from basepi/salt-ssh.umask.29486 
[2015.8] [salt-ssh] Remove umask around actual execution for salt-ssh
 2015-12-08 13:45:58 -07:00
Colton Myers
e59364ad1d Fix failing unit test 2015-12-08 13:45:34 -07:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Colton Myers
867d550271 Merge pull request #29539 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-12-08 12:14:51 -07:00
Colton Myers
2c9c4ba430 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
 2015-12-08 12:14:10 -07:00
Colton Myers
5edfa014f5 Remove umask around actual execution for salt-ssh 2015-12-08 12:05:42 -07:00
rallytime
d8b1ba3991 Make sure ESXCLI gating is correct in vsphere __virtual__ 2015-12-08 11:07:23 -07:00
Justin Findlay
1ad5a088fc grains.core: handle undefined variable 2015-12-08 10:07:01 -07:00
Mike Place
fb02fc1ef1 Merge pull request #29505 from rallytime/fix-28715 
Update boto_rds state docs to include funky yaml syntax for "tags" option.
 2015-12-08 10:05:02 -07:00
Mike Place
de7f3d5a59 Merge pull request #29504 from rallytime/fix-12072 
Document userdata_file option for EC2 driver
 2015-12-08 09:54:33 -07:00
Mike Place
65deba8bb5 Merge pull request #29507 from rallytime/ec2-doc-fix 
Switch volumes and del_*_on_destroy example ordering
 2015-12-08 09:50:10 -07:00
rallytime
55589f8021 Provide some more inline comments for longer functions 2015-12-08 09:20:17 -07:00
Justin Findlay
917e6f850c 2015.8.2 notes: add note about not being released 2015-12-08 09:16:26 -07:00
Justin Findlay
1a8044f0c9 2015.5.7 notes: add note about not being released 2015-12-08 09:12:36 -07:00
Mike Place
38888add5e Merge pull request #29513 from bdrung/2015.8 
Drop obsolete syslog.target from systemd services
 2015-12-08 09:05:01 -07:00
Benjamin Drung
b1a4ade618 Drop obsolete syslog.target from systemd services 
Declaring After=syslog.target is unnecessary by now because syslog is
socket-activated and will therefore be started when needed. Thus remove
the obsolete syslog.target from the systemd service files.
 2015-12-08 13:48:34 +01:00
rallytime
90b4823bc2 Switch volumes and del_*_on_destroy example ordering 
Refs #29101
 2015-12-07 19:30:23 -07:00
rallytime
f43f851a92 Update boto_rds state docs to include funky yaml syntax for "tags" option. 
Fixes #28715
 2015-12-07 17:41:08 -07:00