Nicolas Delaby
e98d18ba41
Expose docker networking as state
2015-11-24 13:55:22 +01:00
Nicolas Delaby
94135d91c3
cosmetic
2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5
Add expose networking to modules.dockerng
2015-11-24 13:55:22 +01:00
Thomas S Hatch
17638c734b
Merge pull request #29108 from lorengordon/type-enforce-length
...
Enforce length as an int, fixes #29107
2015-11-23 12:06:52 -07:00
Colton Myers
233ab8a474
Merge pull request #29125 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-23 11:48:46 -07:00
Mike Place
dc0d47fa2e
Merge pull request #29126 from fcrozat/2015.8
...
Fix deployment when umask is non-standard
2015-11-23 10:53:46 -07:00
Mike Place
994d8bd71a
Merge pull request #29124 from rallytime/bp-28130
...
Back-port #28130 to 2015.8
2015-11-23 10:31:00 -07:00
Colton Myers
1432cc806d
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
2015-11-23 10:08:57 -07:00
Colton Myers
219367a23d
Merge pull request #29128 from cachedout/tweak_29122
...
Set a safer default value for ret in saltmod
2015-11-23 10:07:40 -07:00
Mike Place
b08858b040
Missed check
2015-11-23 10:07:21 -07:00
Mike Place
584efe81ee
Set a safer default value for ret in saltmod
...
Tweak fix in #29122 after review with @basepi
2015-11-23 10:04:34 -07:00
Frederic Crozat
4da11a5f3c
Fix deployment when umask is non-standard. Fixes #29005
2015-11-23 17:58:41 +01:00
Frederic Crozat
bbccb752f9
Fix deployment when umask is non-standard. Fixes #28830
2015-11-23 17:55:48 +01:00
Colton Myers
8d86bc3056
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/states/rabbitmq_user.py
salt/states/user.py
2015-11-23 09:53:11 -07:00
rallytime
e290ea4a3f
Pylint Fix
2015-11-23 09:34:03 -07:00
Nicole Thomas
2250a36647
Merge pull request #29122 from cachedout/issue_29110
...
Fix broken state orchestration
2015-11-23 09:24:18 -07:00
Mike Place
d9c32011b4
Merge pull request #29076 from RealKelsar/2015.8
...
We can't query installed use flags for a non installed pkg
2015-11-23 09:19:40 -07:00
Alex Proca
9d8e5c8b4d
Added missing comma
2015-11-23 09:00:52 -07:00
Bogdan Radulescu
4a7eee08a8
Documented import_keypair for the ec2 driver
2015-11-23 09:00:51 -07:00
Bogdan Radulescu
715c12014c
Added a bunch of instance sizes and updated some outdated ones
2015-11-23 09:00:51 -07:00
Alex Proca
506ff01f65
Import public key
2015-11-23 08:58:43 -07:00
Mike Place
4b9302d794
Fix broken state orchestration
...
This corrects an issue introduced in #28012 wherein the `m_ret` variable
was not set prior to evaluation. Here, we simply set it to None and then check for this type explicitely.
Fixes #29110
2015-11-23 08:09:54 -07:00
Nicole Thomas
1931870f26
Merge pull request #29097 from rallytime/bp-29070
...
Back-port #29070 to 2015.8
2015-11-22 10:03:04 -07:00
Nicole Thomas
200e771efb
Merge pull request #29096 from rallytime/bp-29093
...
Back-port #29093 to 2015.5
2015-11-22 10:02:50 -07:00
Loren Gordon
c71825d3b0
Enforce length as an int, fixes #29107
2015-11-22 10:21:08 -05:00
Quan Tong Anh
3b202efadc
boto_ec2: missing region when checking existence of an EC2 instance
2015-11-21 08:57:24 -07:00
Nicole Thomas
bb28b9186b
Merge pull request #29090 from gtmanfred/2015.8
...
clean up novaclient module
2015-11-21 08:43:58 -07:00
Xiuming Chen
f5734423a4
Compare gem versions as a string.
2015-11-21 08:41:06 -07:00
Nicole Thomas
4ff54c6429
Merge pull request #29095 from terminalmage/pygit2-warning
...
Add warning about pygit2 API instability
2015-11-21 08:38:59 -07:00
Nicole Thomas
27160b0454
Merge pull request #28919 from cro/hue_proxy_backport
...
Update Philips Hue proxy minion to support __proxy__ instead of proxymodule stored in __opts__
2015-11-21 08:31:36 -07:00
Erik Johnson
139f5ba4c3
Add warning about pygit2 API instability
2015-11-20 22:34:58 -06:00
Daniel Wallace
2aab45f9d2
clean up novaclient module
...
get the client a different way, and add specifying the version.
2015-11-20 20:18:23 -06:00
Nicole Thomas
d8a2018bc8
Merge pull request #29084 from rallytime/bp-29055
...
Back-port #29055 to 2015.5
2015-11-20 13:57:54 -07:00
Nicole Thomas
b5cff1a351
Merge pull request #29083 from rallytime/bp-29053
...
Back-port #29053 to 2015.5
2015-11-20 13:57:38 -07:00
Pedro Algarvio
88c0354c0c
Merge pull request #29065 from cachedout/issue_28810
...
Handle failures inside python's inspect if a module is reloaded
2015-11-20 18:10:42 +00:00
Mike Place
52e650aed9
Add section to style guide
...
A brief discussion of variable naming standards in Salt.
2015-11-20 09:23:39 -07:00
Kevin London
f1884de0e7
Update rabbitmq_user.py
...
Corrected spacing to make it clear that the permissions were a level below the vhost name.
2015-11-20 09:21:22 -07:00
Tetja Rediske
f3d1ba1509
We can't query installed use flags for a non installed pkg. Also one if is enough...
2015-11-20 17:05:55 +01:00
Mike Place
4767503eb2
Remove trailing whitespace
2015-11-20 08:53:27 -07:00
Tetja Rediske
96566d3060
We can't query installed use flags for a non installed pkg
2015-11-20 12:40:55 +01:00
Mike Place
c5b667f048
Handle failures inside python's inspect if a module is reloaded
...
Python has a known issue wherein calls to the inspect module which traverse the frame stack will fail if a module has been reloaded.
This caused a serious bug wherein certain uses of the depends decorator would fail hard and prevent the salt module from being initialized and loaded.
This works around that by simply ignoring the inspect failure.
cc: @sjorge (This may impact your fix for esky in #25946 . Please have a look.)
2015-11-19 16:30:17 -07:00
Mike Place
714ef8ff27
Merge pull request #29057 from lyft/file-manage-local-source-list
...
Add local file support for file.managed source list
2015-11-19 14:57:34 -07:00
Mike Place
f4f43381fc
Merge pull request #29017 from jfindlay/pager_util
...
pagerduty runner: add missing salt.utils import
2015-11-19 12:28:35 -07:00
Mike Place
1c61bce0a6
Merge pull request #29039 from alprs/feature-virtualenv_pip_pkgs
...
Allow passing list of pip packages to virtualenv.managed
2015-11-19 12:13:50 -07:00
Mike Place
b692ab1cfb
Merge pull request #29047 from schwing/fix-gpg-exception
...
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
2015-11-19 12:07:36 -07:00
Mike Place
b4fc2f28a4
Merge pull request #29050 from terminalmage/issue29015
...
Make git_pillar global config option docs more prominent
2015-11-19 12:06:38 -07:00
Mike Place
4b3b2fe1e7
Merge pull request #29048 from nmadhok/patch-1
...
Fix incorrect debug log statement
2015-11-19 12:04:10 -07:00
Mike Place
e52c117368
Merge pull request #29024 from jfindlay/run_test
...
cache runner test: add new unit tests
2015-11-19 12:02:54 -07:00
Mike Place
bcec8d8608
Merge pull request #28967 from cro/fx2_switch
...
Fix some issues with password changes
2015-11-19 11:57:39 -07:00
Erik Johnson
20da057a94
Make git_pillar global config option docs more prominent
2015-11-19 11:52:45 -06:00
