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
57,035 Commits 24 Branches 182 Tags 341 MiB
5f828882b8
Commit Graph

57035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Lee
d6496ce814 Merge pull request #1 from jfindlay/reg 
fix reg unit tests
 2015-07-27 11:00:39 -06:00
Peter Tripp
9ec3ae96d4 Add file as supported protocol for file source_hash. Fixes #23764. 
Conflicts:
	salt/modules/file.py
 2015-07-27 11:59:28 -05:00
Justin Findlay
3b0cc6592a fix reg unit tests 2015-07-27 10:57:05 -06:00
Thomas S Hatch
65d6ec0659 don't override the minion config unless requested 2015-07-27 10:51:03 -06:00
Thomas S Hatch
26c858361c Add state_top_saltenv to the config chain 2015-07-27 10:50:06 -06:00
Thomas S Hatch
36a3b674a7 Add raet support for state_top_saltnev 2015-07-27 10:49:42 -06:00
Thomas S Hatch
f6fa025b13 Add saltenv top file support to salt master_opts 2015-07-27 10:49:15 -06:00
Thomas S Hatch
4a1c53309b Add state_top_saltenv support 2015-07-27 10:48:50 -06:00
Charlie Root
361f6cc23f Allow zpool.create on character devices 
Fixes #24920
 2015-07-27 16:30:20 +00:00
rallytime
56091582a1 Added remaining VM functions to the OpenNebula driver 2015-07-27 10:25:43 -06:00
Thomas S Hatch
29c66d85a4 Merge pull request #25740 from rallytime/bp-25722 
Back-port #25722 to 2015.5
 2015-07-27 10:08:40 -06:00
Thomas S Hatch
135b03e53b Merge pull request #25739 from rallytime/bp-25709 
Back-port #25709 to 2015.5
 2015-07-27 10:08:27 -06:00
Thomas S Hatch
095a923b6e Merge pull request #25738 from rallytime/bp-25671 
Back-port #25671 to 2015.5
 2015-07-27 10:08:23 -06:00
Thomas S Hatch
05fbfe64e9 Merge pull request #25737 from rallytime/bp-25608 
Back-port #25608 to 2015.5
 2015-07-27 10:08:18 -06:00
Thomas S Hatch
9817fc5556 Merge pull request #25733 from davidjb/mount-fix 
Avoid IndexError when listing mounts if mount output ends in newline
 2015-07-27 10:08:05 -06:00
Thomas S Hatch
82ba390b7b Merge pull request #25705 from blackduckx/augeas-setm 
Support for setm augeas command.
 2015-07-27 10:07:10 -06:00
Thomas S Hatch
3a15df22ac Merge pull request #25704 from cachedout/master_type_2014_7 
Ensure prior alignment with master_type in 2014.7
 2015-07-27 10:06:35 -06:00
Thomas S Hatch
f732be365d Merge pull request #25703 from cachedout/master_type_2015_5 
Return to `str` for master_type for 2015.5
 2015-07-27 10:06:22 -06:00
Joseph Hall
828ea7a332 Merge pull request #25708 from rallytime/one-images 
Added some image snapshot functions to the OpenNebula driver
 2015-07-27 09:53:38 -06:00
Joseph Hall
0543b89138 Merge pull request #25715 from rallytime/one-actions 
Added start, stop, and reboot functions to OpenNebula
 2015-07-27 09:53:33 -06:00
Gareth J. Greenaway
6914408df1 Adding a time function to the status module to return the current date & time on the system 2015-07-27 08:22:54 -07:00
Justin Findlay
bd4540e3a6 Merge pull request #25730 from sjorge/patch-1 
patchelf lives in pkgsrc
 2015-07-27 09:18:50 -06:00
Nicole Thomas
e0b3757bcd Merge pull request #25724 from garethgreenaway/slack_engine 
Slack engine
 2015-07-27 09:08:28 -06:00
David Boucha
dea3d31578 Merge pull request #25702 from twangboy/fix_25144 
Fixed win_user module for groups with spaces in the name
 2015-07-27 09:06:33 -06:00
David Boucha
186af9b54d Merge pull request #25711 from twangboy/fix_25351 
Fixed problem with win_servermanager.list_installed
 2015-07-27 09:05:48 -06:00
Jorge Schrauwen
c825683363 cleanup of python requirements 
halite is deprecated, could requirements file got removed so importing it fails in the until loops.
 2015-07-27 09:04:23 -06:00
Doug Luce
c4c356db5b Fix pkg.installed using salt:// sources on FreeBSD 
This just needed a little love.

This addresses #25726
 2015-07-27 09:02:35 -06:00
Alexey Pakseykin
c33eb813ea Change docs for --static option with JSON - text B 2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb Change docs for --static option with JSON - text A 2015-07-27 09:00:59 -06:00
Cole Kowalski
fda2ffa44e add direct-io-mode to mount_invisible_options 2015-07-27 08:59:04 -06:00
Nick Milosevic
525cd70589 added a parameter so verifying SSL is now optional instead of hard-coded 2015-07-27 08:57:17 -06:00
ralf matulat
df85d734bc Fix: prevent git.latest from removing target 
Fixes #25229
While force=True and test=True git.latest should not remove the
target directory.
 2015-07-27 08:53:31 -06:00
Justin Findlay
7bb93fed76 insert explicit formatter number 
Fixes #25732.
 2015-07-27 08:27:51 -06:00
Daniel Hobley
1ad9da30e5 Added a way to wait for a reboot to complete on Windows 
- This is useful if you have many states that are being run in a highstate and you don't want the rest of the states, running just before a reboot as this could lead to half complete states i.e installing software
 2015-07-27 14:16:02 +02:00
David\ Beitey
6d0bce2418 Test length of comps when listing mounts 
If the stdout returned from the mount command ends with a newline char,
this produces an empty string during splitting.  This empty string is
attempted to be ``split()`` on whitespace, and thus produces an
empty-length list, which errors on the following line because no
elements are present.
 2015-07-27 17:18:38 +10:00
David Ward
fbef34ca19 Merge remote-tracking branch 'upstream/develop' 2015-07-27 17:04:03 +10:00
David Ward
7b8096b945 Grammar fix. 2015-07-27 17:02:31 +10:00
Justin Findlay
5bb8c5adf4 Merge pull request #25731 from sjorge/patch-2 
cleanup of python requirements
 2015-07-26 20:21:37 -06:00
Justin Findlay
a9da4d54c7 Merge pull request #25727 from dougluce/pkgng-fix-add 
Fix pkg.installed using salt:// sources on FreeBSD
 2015-07-26 20:14:29 -06:00
Jorge Schrauwen
163346d02e cleanup of python requirements 
halite is deprecated, could requirements file got removed so importing it fails in the until loops.
 2015-07-26 12:31:46 +02:00
Jorge Schrauwen
349b029cd8 patchelf lives in pkgsrc 
alteast on base-64-lts 14.4.0 release
 2015-07-26 12:23:59 +02:00
Justin Findlay
27f12e80a8 Merge pull request #25722 from uvsmtid/json-static-output 
Minor docs changes to emphasize JSON output problems without `--static` option
 2015-07-25 20:01:43 -06:00
Doug Luce
5cfe52591b Fix pkg.installed using salt:// sources on FreeBSD 
This just needed a little love.

This addresses #25726
 2015-07-25 18:50:50 -07:00
Gareth J. Greenaway
faf2e917d1 lint fixes 2015-07-25 17:56:19 -07:00
Joseph Hall
17151c72ea Merge pull request #25725 from AkhterAli/develop 
added eu-central-1
 2015-07-25 18:46:15 -06:00
Akhter Ali
7d016e2009 added eu-central-1 2015-07-25 19:51:56 -04:00
Gareth J. Greenaway
e6eafe9d06 Adding an engine to listen for Slack events. Alternatively control Salt via commands send via Slack. 2015-07-25 15:10:11 -07:00
Alexey Pakseykin
454b7b5815 Change docs for --static option with JSON - text B 2015-07-25 23:39:50 +08:00
Alexey Pakseykin
39d45ec691 Change docs for --static option with JSON - text A 2015-07-25 23:37:49 +08:00
Frederic Brin
cad0f2b46e Augeas: fix pylint and documentation 
+ Fix pylint
+ Add setm support in the documentation
 2015-07-25 15:02:16 +02:00