jacobhammons
|
ab890b632a
|
Merge pull request #29417 from jacobhammons/repo-install-updates
Repo install updates
|
2015-12-03 19:39:41 -07:00 |
|
Jacob Hammons
|
d58182c5fa
|
updated repo path for RHEL installation
|
2015-12-03 19:36:12 -07:00 |
|
Mike Place
|
cb1e2e6e73
|
Merge pull request #29402 from techhat/ratelimit
Add rate limiting to linode
|
2015-12-03 13:27:10 -07:00 |
|
Mike Place
|
8fe39d0ef8
|
Merge pull request #29400 from twangboy/fix_19332
Fix #19332
|
2015-12-03 13:25:16 -07:00 |
|
Joseph Hall
|
f0a4d93077
|
Add rate limiting to linode
|
2015-12-03 11:31:25 -07:00 |
|
twangboy
|
7bdddaca53
|
Fixed grammer
|
2015-12-03 11:18:32 -07:00 |
|
twangboy
|
d965d00a09
|
Fix #19332
Clarified precedence of pillar values
|
2015-12-03 11:15:46 -07:00 |
|
Mike Place
|
d2c0fcbc97
|
Merge pull request #29398 from cachedout/lint_29288
Lint 29288
|
2015-12-03 11:03:53 -07:00 |
|
Mike Place
|
3b0033e529
|
Lint #29288
|
2015-12-03 11:02:49 -07:00 |
|
Jacob Hammons
|
5e54359869
|
Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes.
|
2015-12-03 10:55:32 -07:00 |
|
Mike Place
|
5b8e7820ac
|
Merge pull request #29331 from DSRCompany/bug/29116_raet_dns_error_2
Bugfix - #29116 raet dns error
|
2015-12-03 10:10:39 -07:00 |
|
Mike Place
|
7bc6b1210d
|
Merge pull request #29390 from jacobhammons/2015.8
updated version numbers in documentation
|
2015-12-03 10:02:05 -07:00 |
|
Dmitry Kuzmenko
|
8c2b217af5
|
Make pylint happy
|
2015-12-03 19:09:30 +03:00 |
|
Mike Place
|
fd677e1d58
|
Merge pull request #29381 from nmadhok/2015.8-runtime-fix
No need to deepcopy since six.iterkeys() creates a copy
|
2015-12-03 08:54:52 -07:00 |
|
Jacob Hammons
|
486935b233
|
updated version numbers
|
2015-12-03 08:21:50 -07:00 |
|
Nitin Madhok
|
f109698196
|
No need to deepcopy since six.iterkeys() creates a copy
|
2015-12-03 01:06:51 -05:00 |
|
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 |
|
Dmitry Kuzmenko
|
e5672ee716
|
Don't exit if no master found
|
2015-12-02 16:07:46 +03:00 |
|
Dmitry Kuzmenko
|
1c324f5467
|
Don't fail if can't connect to master
|
2015-12-02 15:29:35 +03: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 |
|
Claudiu Popescu
|
386459ca6d
|
Merge pull request #1 from jfindlay/glustest
modules.glusterfs: fix start_volume unit test
|
2015-12-01 20:03:31 +02: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 |
|
Justin Findlay
|
4d6c71aa80
|
modules.glusterfs: fix start_volume unit test
|
2015-12-01 10:53:32 -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 |
|