Michael Calmer
|
93db6cbddc
|
unify behavior of refresh
|
2016-02-24 10:09:04 -07:00 |
|
C. R. Oldham
|
6f04fc9192
|
Check to see if a path is a link, because it's likely that if it IS
a link, one of the other paths points to it. Ignore so we don't get
duplicates.
|
2016-02-24 10:08:03 -07:00 |
|
C. R. Oldham
|
d92e2ea188
|
Some distros do not seem to have a /lib/systemd, but do have a /usr/lib/systemd
|
2016-02-24 10:08:03 -07:00 |
|
twangboy
|
78535f7306
|
Fix some formatting issues
|
2016-02-24 10:08:03 -07:00 |
|
Nicolas Delaby
|
d2bcc37416
|
Pull missing images when calling dockerng.running
fixes #29727
|
2016-02-24 10:08:03 -07:00 |
|
twangboy
|
b0f2d3d9f6
|
Clarification for Windows Package Manger
Formatting issues
|
2016-02-24 10:08:03 -07:00 |
|
Mike Place
|
89bc27c48b
|
Merge pull request #31443 from jfindlay/blackout
tests.runtests: add minion test runner
|
2016-02-24 09:51:26 -07:00 |
|
Justin Findlay
|
f671c3bf3b
|
tests.runtests: add minion test runner
|
2016-02-23 13:47:47 -07:00 |
|
Mike Place
|
3b3106c0cd
|
Merge pull request #31421 from techhat/etcdauth
Add some auth handling for etcd
|
2016-02-23 08:49:27 -07:00 |
|
Joseph Hall
|
5301f4239b
|
Fixing syntax error
|
2016-02-22 16:36:23 -07:00 |
|
Joseph Hall
|
a7c8796381
|
Removing redundant Nones
|
2016-02-22 16:16:05 -07:00 |
|
Joseph Hall
|
e3696d5603
|
Add some auth handling for etcd
|
2016-02-22 16:02:05 -07:00 |
|
Mike Place
|
347b511c1a
|
Merge pull request #31413 from cachedout/lint_31344
Lint 31344
|
2016-02-22 13:00:20 -07:00 |
|
Mike Place
|
320d8279ce
|
Lint #31344
|
2016-02-22 12:59:25 -07:00 |
|
mkuchin
|
bbe8acba0c
|
Fixes #31343
|
2016-02-22 12:58:47 -07:00 |
|
Mike Place
|
134c0481a0
|
Merge pull request #31404 from sjorge/2016.3-fixmdatagrains
mdata grains missing on 2016.3 and develop when running linux
|
2016-02-22 12:39:42 -07:00 |
|
Jorge Schrauwen
|
d09d1291c3
|
fix typo and improve comment
|
2016-02-22 19:36:42 +00:00 |
|
Mike Place
|
e1ade05e54
|
Merge pull request #31355 from rallytime/fix-31330
Fix orchestrate outputter when retcode is appended to orchestrate run
|
2016-02-22 11:13:07 -07:00 |
|
Mike Place
|
adac349699
|
Merge pull request #31379 from sjorge/module-zfs-leftover-log
salt.module.zfs had leftover log statements
|
2016-02-22 11:12:42 -07:00 |
|
Mike Place
|
268180f49b
|
Merge pull request #31386 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
|
2016-02-22 10:43:32 -07:00 |
|
Mike Place
|
0a63aa4fab
|
Merge pull request #31377 from jfindlay/blackout
add integration tests for minion blackout
|
2016-02-22 10:30:34 -07:00 |
|
rallytime
|
8d928ab34a
|
Pylint fix from wierd git behavior
|
2016-02-22 09:24:13 -07:00 |
|
Jorge Schrauwen
|
ac44e2e259
|
make the mdata grains work on linux when running in a zone
|
2016-02-22 13:37:24 +00:00 |
|
Jorge Schrauwen
|
22a64ac9e4
|
fix virtual grain on SmartOS
|
2016-02-22 13:13:19 +00:00 |
|
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 |
|
Jorge Schrauwen
|
05ec1d8ce3
|
remove left over debug logging
|
2016-02-20 11:00:07 +00: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
|
8623c24335
|
add integration tests for minion blackout
Related to #30868.
|
2016-02-19 18:04:31 -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 |
|
rallytime
|
28763be519
|
Remove unused import
|
2016-02-19 09:51:18 -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 |
|
rallytime
|
9b52e39e90
|
Add testcase for state.orchestrate output
|
2016-02-19 09:14:46 -07: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 |
|
rallytime
|
08a60e7b75
|
Fix orchestrate outputter when retcode is appended to orchestrate run
Fixes #31330
Refs #27175, #27838, and #27887
|
2016-02-18 16:35:48 -07:00 |
|
Erik Johnson
|
eebc325040
|
Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options
|
2016-02-18 16:34:14 -06:00 |
|