valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,818 Commits 24 Branches 182 Tags 341 MiB
4baea26c58
Commit Graph

65818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
 2016-02-20 12:27:41 -07:00
Mike Place
174ee10fc2 Merge pull request #31354 from ticosax/dont-require-auth-for-all-registries 
[dockerng] Dont require auth for all registries
 2016-02-19 22:45:10 -07:00
Mike Place
87032995ed Merge pull request #31372 from jfindlay/process_log 
utils.process: reduce log level
 2016-02-19 22:44:11 -07:00
Justin Findlay
238a95b258 utils.process: reduce log level 
Similar to 33844c3c.  Without this, the minion debug log fills up with
`Process manager iteration` at a rate of about 1 every 10-15 seconds.
 2016-02-19 15:34:03 -07:00
Nicole Thomas
8d0498eff4 Merge pull request #31368 from whiteinge/netapi-client-list 
Update list of netapi clients for autoclass
 2016-02-19 13:57:28 -07:00
Nicole Thomas
9b0e29107b Merge pull request #31367 from techhat/sdbdocs 
Add docs on how to actually use SDB
 2016-02-19 13:07:16 -07:00
Seth House
0cfe5d89a0 Update list of netapi clients for autoclass 2016-02-19 13:07:09 -07:00
Nicole Thomas
7e599f0e27 Merge pull request #31357 from ticosax/support-docker-inconsistencies 
[dockerng] Support docker inconsistencies
 2016-02-19 13:02:08 -07:00
Nicole Thomas
18bd78260d Merge pull request #31353 from ticosax/fix-when-port-are-integers 
[dockerng] Fix when ports are integers
 2016-02-19 12:55:30 -07:00
Nicole Thomas
dec254a7a2 Merge pull request #31346 from ticosax/backport-31130-to-2015.8 
Backport #31130 to 2015.8
 2016-02-19 12:46:48 -07:00
Joseph Hall
eea192a545 Add docs on how to actually use SDB 2016-02-19 11:55:39 -07:00
Nicole Thomas
d639d65381 Merge pull request #31332 from terminalmage/issue31167 
Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options
 2016-02-19 11:31:29 -07:00
Nicole Thomas
d067e77fee Merge pull request #31305 from mcalmer/zypper-non-interactive-everywhere 
call zypper with option --non-interactive everywhere
 2016-02-19 11:14:56 -07:00
Nicolas Delaby
3672b8e7b1 docker daemon returns sometimes empty list and sometimes None 
We deal with it
 2016-02-19 17:26:21 +01:00
Nicolas Delaby
4a9f661d66 It exists public registries where auth is not required. 2016-02-19 16:57:52 +01:00
Nicolas Delaby
20fdc43968 Follow up for #31326 
ports will most likely be defined as integer
 2016-02-19 16:21:06 +01:00
Michael Calmer
75e776761c write a zypper command builder function 2016-02-19 11:50:31 +01:00
Nicolas Delaby
a8dc33a5e3 Saltnado provide also get parameters to the context 2016-02-19 09:11:15 +01:00
jacobhammons
98a14f8090 Merge pull request #31337 from jacobhammons/dot7 
Release notes and versioning for 2015.8.7
 2016-02-18 17:20:29 -07:00
Jacob Hammons
d4fb33939e Release notes and versioning for 2015.8.7 2016-02-18 17:19:54 -07:00
Erik Johnson
eebc325040 Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options 2016-02-18 16:34:14 -06:00
Mike Place
f0ba9c1eca Merge pull request #31326 from ticosax/2015.8-dockerng-detect-settings-removal 
[dockerng ] Detect settings removal
 2016-02-18 15:02:50 -07:00
Mike Place
02f79dc2b3 Merge pull request #31322 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-18 14:28:02 -07:00
rallytime
3486eb9f0f Pylint try 2 2016-02-18 12:45:03 -07:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings. 
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
 2016-02-18 20:23:31 +01:00
Mike Place
130f515391 Merge pull request #31292 from twangboy/win_servermanager 
Fix dunder virtual to check for Remote Administration Tools
 2016-02-18 11:57:26 -07:00
Mike Place
734ad96faf Merge pull request #31314 from sjorge/state-smartos-NoneType 
fix salt.states.smartos tripping over NoneType
 2016-02-18 11:56:14 -07:00
rallytime
b1455bdec4 Pylint fix 2016-02-18 11:55:12 -07:00
Mike Place
b6b1dc9e00 Merge pull request #31321 from cachedout/backport_31310 
Made postgres module initdb dependency optional
 2016-02-18 11:48:45 -07:00
Mike Place
f6391f53c3 Merge pull request #31320 from thatch45/thor_notes 
Add provisional statement to Thorium
 2016-02-18 11:22:25 -07:00
rallytime
01aa33ac12 Merge branch '2015.8' into '2016.3' 2016-02-18 11:13:23 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Andrew Colin Kissa
c09d9263d0 Made postgres module initdb dependency optional 
On some distros (like ubuntu, debian) initdb is
not in the $PATH and is provided by the server
package.

The initdb dependency would require that the
server package be installed to manage remote
databases which is not optimal.

Issue reported by @ticosax in pull request
https://github.com/saltstack/salt/pull/30537#issuecomment-185675050
 2016-02-18 11:10:43 -07:00
Mike Place
5d31714b44 Merge pull request #31287 from joejulian/2015.8_30932_peer_probe_by_ip 
Rework tests and fix reverse peering with gluster 3.7
 2016-02-18 10:57:23 -07:00
Thomas S Hatch
2ef3918366 Add provisional statement to Thorium 2016-02-18 10:47:10 -07:00
Mike Place
7b73cad4ee Merge pull request #31318 from thatch45/thor_notes 
Add Thorium docs
 2016-02-18 10:44:07 -07:00
Mike Place
a2f6447f8d Merge pull request #31196 from sakateka/utils-network-fix 
Here are a few fixes utils.network
 2016-02-18 10:27:00 -07:00
Mike Place
d20a30b8be Merge pull request #31299 from rallytime/fix-29795 
Allow state-output and state-verbose default settings to be set from CLI
 2016-02-18 10:25:23 -07:00
Mike Place
11579df3fa Merge pull request #31114 from twangboy/pkg_latest2 
Fix pkg state module to deal with version 'latest'
 2016-02-18 10:17:18 -07:00
Mike Place
fe316eb3d2 Merge pull request #31265 from terminalmage/issue9272 
Add skip_verify argument to file.managed state
 2016-02-18 10:15:16 -07:00
Mike Place
25d8af21c9 Merge pull request #31317 from terminalmage/git-version-audit 
Fix versonadded directive
 2016-02-18 09:56:32 -07:00
Thomas S Hatch
56634682b2 sp 2016-02-18 09:32:23 -07:00
Thomas S Hatch
3ab8d21927 Add Thorium docs 2016-02-18 09:17:27 -07:00
Erik Johnson
acc3b54621 Fix versonadded directive 2016-02-18 10:14:32 -06:00
Mike Place
f2b662371c Merge pull request #31301 from terminalmage/issue30999 
Corrected fix for #30999
 2016-02-18 08:59:39 -07:00
Mike Place
408d89e174 Merge pull request #31302 from terminalmage/git-version-audit 
Audit CLI opts used in git states
 2016-02-18 08:58:48 -07:00
Mike Place
098f05eb3c Merge pull request #31312 from terminalmage/merge-forward-2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-02-18 08:57:08 -07:00
Jorge Schrauwen
19e2b46c7f fix salt.states.smartos tripping over NoneType 2016-02-18 15:13:05 +00:00
Erik Johnson
808d150fe4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.5-2015.8 2016-02-18 09:03:30 -06:00
Erik Johnson
ca410c0a94 Audit CLI opts used in git states 
This restricts the git state module to git 1.6.5 or later, as some of
the core functionality needed for git.latest was not present before that
version. This release is over 6 years old now, so this change should be
safe to make.

In addition, this stops git.latest from trying to use the --ff-only
argument when running a git merge to fast-forward the repo, in versions
where this option is not available.
 2016-02-18 08:18:46 -06:00