Mike Place
|
2973025058
|
Merge pull request #29349 from cro/fx2_name_fix
Fix mis-setting chassis names
|
2015-12-02 17:56:54 -07:00 |
|
C. R. Oldham
|
95d6d72a5d
|
Fix mis-setting the name of the chassis.
|
2015-12-02 15:51:36 -07:00 |
|
Mike Place
|
17d80c051a
|
Merge pull request #29334 from rallytime/bp-29237
Back-port #29237 to 2015.8
|
2015-12-02 12:37:31 -07:00 |
|
Mike Place
|
5ec7947595
|
Merge pull request #29300 from ticosax/dockerng-volumes
[dockerng] Add support for volume management in dockerng
|
2015-12-02 10:48:53 -07:00 |
|
Nicolas Delaby
|
80d085ea92
|
fix typo
|
2015-12-02 17:27:20 +01:00 |
|
Nicolas Delaby
|
cb9cb463b0
|
Provide states for managing docker volumes
|
2015-12-02 17:27:20 +01:00 |
|
Nicolas Delaby
|
dff6fa1fb2
|
Add execution module to manage docker volumes
|
2015-12-02 17:27:20 +01:00 |
|
Jorge Schrauwen
|
598226def1
|
fix unit test (attempt 1)
|
2015-12-02 08:34:59 -07:00 |
|
Jorge Schrauwen
|
a461d7bf12
|
changed from Boron to 2015.8.4, so this can be backported
|
2015-12-02 08:34:59 -07:00 |
|
Jorge Schrauwen
|
3892b12514
|
fix up a few remarks from jfindlay
|
2015-12-02 08:34:59 -07:00 |
|
Jorge Schrauwen
|
2f940e22aa
|
also we should keep returning {} for other systems
|
2015-12-02 08:34:59 -07:00 |
|
Jorge Schrauwen
|
4953f58894
|
forgot to remove a debug line, how embarasing
|
2015-12-02 08:34:59 -07:00 |
|
Jorge Schrauwen
|
e96f3c0c3b
|
fix docs in salt/utils/network.py #29231 - looks like this got copied at some point
|
2015-12-02 08:34:58 -07:00 |
|
Jorge Schrauwen
|
3888bb403f
|
fixup network.default_route with family set on SunOS #29233
|
2015-12-02 08:34:58 -07:00 |
|
Jorge Schrauwen
|
c0e6ea98a6
|
fix network.active_tcp on SunOS (we fake it until we make it) #29232
|
2015-12-02 08:34:58 -07:00 |
|
Jorge Schrauwen
|
92f881284e
|
add decorator to network.dig #29234
|
2015-12-02 08:34:58 -07:00 |
|
Jorge Schrauwen
|
77950eb55c
|
fix docstring for get_bufsize #29235
|
2015-12-02 08:34:58 -07:00 |
|
Jorge Schrauwen
|
52fb80cd18
|
fix docstring for mod_bufsize #29236
|
2015-12-02 08:34:58 -07:00 |
|
Mike Place
|
99b7d87688
|
Merge pull request #29218 from clan/service_state
check service enable state in test mode
|
2015-12-02 08:31:00 -07:00 |
|
Justin Findlay
|
08ced73b13
|
Merge pull request #29315 from jfindlay/docs
dev tutorial doc: fix markup errors
|
2015-12-01 14:42:17 -07:00 |
|
Colton Myers
|
a3a463ff8b
|
Merge pull request #29317 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
|
2015-12-01 14:28:30 -07:00 |
|
Colton Myers
|
0d90dd3a19
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
debian/salt-master.service
salt/modules/win_pkg.py
|
2015-12-01 13:26:44 -07:00 |
|
Colton Myers
|
14e94b3593
|
Merge pull request #29316 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
|
2015-12-01 13:20:23 -07:00 |
|
Colton Myers
|
33f40b3c47
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
2015-12-01 13:19:39 -07:00 |
|
Justin Findlay
|
e8e23dc444
|
dev tutorial doc: fix markup errors
|
2015-12-01 13:05:57 -07:00 |
|
Mike Place
|
39667fda12
|
Merge pull request #29240 from clan/linux_acl
handle acl_type [[d]efault:][user|group|mask|other]
|
2015-12-01 10:56:20 -07:00 |
|
Mike Place
|
027bed7c90
|
Merge pull request #29305 from lorengordon/source_hash_protos
Add 'file' as a source_hash proto
|
2015-12-01 10:39:37 -07:00 |
|
Loren Gordon
|
53fdf0bf97
|
Update message for invalid source_hash
|
2015-12-01 11:59:12 -05:00 |
|
Loren Gordon
|
2d20d71bd5
|
Add file as a source_hash proto
|
2015-12-01 11:43:47 -05:00 |
|
Mike Place
|
1129ee1d2e
|
Merge pull request #29272 from jfindlay/win_up_time
win_status module: handle 12 hour time in uptime
|
2015-12-01 09:33:12 -07:00 |
|
Mike Place
|
0fd3e8b0fb
|
Merge pull request #29289 from terminalmage/issue26526
file.managed: Allow local file sources to use source_hash
|
2015-12-01 09:19:27 -07:00 |
|
Mike Place
|
d2fb2109a3
|
Merge pull request #29296 from douardda/patch-3
Use process KillMode on Debian systems also
|
2015-12-01 09:00:16 -07:00 |
|
David Douard
|
d2885390f4
|
Use process KillMode on Debian systems also
closes #29295
|
2015-12-01 11:16:06 +01:00 |
|
Z. Liu
|
a1250a9729
|
check service enable state in test mode
|
2015-12-01 15:02:00 +08:00 |
|
Z. Liu
|
02429aca69
|
handle acl_type [[d]efault:][user|group|mask|other]
|
2015-12-01 14:55:08 +08:00 |
|
Erik Johnson
|
64ae3f996e
|
file.managed: Allow local file sources to use source_hash
Fixes #26526.
|
2015-11-30 16:44:06 -06:00 |
|
Mike Place
|
8d32d8d43d
|
Merge pull request #29264 from alprs/fix-ssh_auth_absent_test
Prevent ssh_auth.absent from running when test=True
|
2015-11-30 14:54:15 -07:00 |
|
Mike Place
|
459d30f27f
|
Merge pull request #29277 from terminalmage/issue29071
Update git_pillar runner to support new git ext_pillar config schema
|
2015-11-30 14:39:51 -07:00 |
|
Mike Place
|
df1f0d93c7
|
Merge pull request #29283 from cachedout/style_29139
Single-quotes and use format
|
2015-11-30 14:34:41 -07:00 |
|
Mike Place
|
d764497b17
|
Single-quotes and use format
Refs #29139
|
2015-11-30 14:32:26 -07:00 |
|
Mike Place
|
3aa84b6763
|
Merge pull request #29139 from thomaso-mirodin/salt-ssh-flat-roster-range-filter
[salt-ssh] Add a range roster and range targeting options for the flat roster
|
2015-11-30 14:25:50 -07:00 |
|
Mike Place
|
dbf7755aa2
|
Merge pull request #29282 from cachedout/fix_29279
dev docs: add development tutorial
|
2015-11-30 14:14:49 -07:00 |
|
Mike Place
|
1efaab2dd5
|
Fix typo in #29279
|
2015-11-30 13:59:47 -07:00 |
|
Mike Place
|
87e4aa4fae
|
Merge pull request #28994 from timcharper/2015.8.1-dev
add support to s3 for aws role assumption
|
2015-11-30 13:52:17 -07:00 |
|
Mike Place
|
3d16434f14
|
Merge pull request #29278 from techhat/issue29209
Add verify_log to SPM
|
2015-11-30 13:48:32 -07:00 |
|
Mike Place
|
d651d7167e
|
Merge pull request #29067 from jacksontj/2015.8
Fix infinite recursion in state compiler for prereq of SLSs
|
2015-11-30 13:27:09 -07:00 |
|
Mike Place
|
d42bcea905
|
Merge pull request #29207 from jfindlay/ret_non_shadow
do not shadow ret function argument
|
2015-11-30 13:14:06 -07:00 |
|
Mike Place
|
8cc1d8de46
|
Merge pull request #29215 from rallytime/bp-29192
Back-port #29192 to 2015.8
|
2015-11-30 13:12:30 -07:00 |
|
Mike Place
|
f488d25911
|
Merge pull request #29217 from clan/highstate_duration
show duration only if state_output_profile is False
|
2015-11-30 13:11:18 -07:00 |
|
Justin Findlay
|
a5ea39132f
|
dev docs: add development tutorial
|
2015-11-30 13:11:13 -07:00 |
|