Justin Findlay
c3744ef0db
Merge pull request #24083 from swdream/swedream_Fix_code_block_syntax
...
fix code block syntax
2015-05-22 13:56:17 -06:00
thanhnt
01b546e6e8
fix code block syntax
2015-05-23 00:57:42 +07:00
Thomas S Hatch
55732ab260
Merge pull request #24061 from diego-XA/develop
...
Fix for https://github.com/saltstack/salt/issues/23221
2015-05-22 10:57:55 -06:00
Nicole Thomas
d5b5fc16c7
Merge pull request #24072 from rallytime/merge-24055
...
Merge #24055 with version added tags
2015-05-22 10:57:29 -06:00
Thomas S Hatch
273b0b15fc
Merge pull request #24055 from mgwilliams/boto
...
add zone management funcs to boto_route53
2015-05-22 10:57:21 -06:00
Thomas S Hatch
4d51b5781b
Merge pull request #24053 from gladiatr72/sqlite_que__adjust_quoting_take2
...
Sqlite que adjust quoting take2
2015-05-22 10:57:07 -06:00
Thomas S Hatch
64fc2944d9
Merge pull request #23870 from kaithar/issue/attempt-reconnect
...
MySQL can go away, this seems the most reliable way of checking it's …
2015-05-22 10:55:13 -06:00
Thomas S Hatch
dd50688d95
Merge pull request #23981 from DSRCompany/zmq_monitor_master
...
Add ZMQ socket monitor for master queue channel
2015-05-22 10:28:55 -06:00
Thomas S Hatch
033cc83b1b
Merge pull request #23978 from kaithar/issue/re-raise_preserving_context
...
Instead of raising the exception() instance, raise from exc_info()
2015-05-22 10:28:30 -06:00
Thomas S Hatch
c4a0ae5913
Merge pull request #23949 from gladiatr72/fix_salt.cloud.Cloud_salt.client_get_local_client_call
...
Fix salt.cloud.Cloud salt.client.get_local_client call
2015-05-22 10:27:24 -06:00
Thomas S Hatch
94b951d24a
Merge pull request #23920 from ticosax/fix-pulled-image-comparison
...
[dockerng] Fix pulled image comparison
2015-05-22 10:26:37 -06:00
rallytime
3609c1059c
Merge #24055 with versionadded tags for new functions
2015-05-22 08:55:12 -06:00
Nicolas Delaby
09d934b1ac
Fix pull images
...
add support for use-case when a pulled new-image is forced but no new images
was downloaded from the registry.
2015-05-22 15:51:27 +02:00
Erik Johnson
01fb405d01
Merge pull request #24067 from ticosax/compare-images-by-id
...
[dockerng] compare images by ID not by name
2015-05-22 08:46:15 -05:00
Nicolas Delaby
b681f71eb3
compare images by ID not by name
...
Because the name can be no longer be correct if an active tag moved to a different image.
It happens frequently when working against `latest` tag.
2015-05-22 14:31:19 +02:00
Diego Blanco
d2aec156ff
Fix for https://github.com/saltstack/salt/issues/23221
2015-05-22 11:21:04 +02:00
Justin Findlay
475032c9de
Merge pull request #24054 from mgwilliams/s3
...
s3.head: return useful data
2015-05-21 23:35:00 -06:00
Matthew Williams
80c7a697ae
s3.head: return useful data
2015-05-22 00:14:36 +00:00
Matthew Williams
8677ad314b
Merge remote-tracking branch 'origin/develop' into boto
2015-05-22 00:12:57 +00:00
Matthew Williams
8996b19c33
modules.boto_route53: add zone management funcs
2015-05-22 00:12:50 +00:00
Justin Findlay
f851ec75ca
Merge pull request #24051 from rallytime/update_pycrypto_requirement
...
Update minimum version for pycrypto
2015-05-21 17:44:17 -06:00
rallytime
fba0de8bfa
Update minimum version for pycrypto
2015-05-21 16:49:34 -06:00
Nicole Thomas
d13e2a365c
Merge pull request #24041 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-21 13:32:37 -06:00
Colton Myers
58aed60838
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/runners/lxc.py
2015-05-21 11:27:52 -06:00
Colton Myers
f7fae26059
Merge pull request #23995 from makinacorpus/lxc_path_pre
...
Lxc path pre
2015-05-21 11:26:03 -06:00
Justin Findlay
26d6851666
Merge pull request #24032 from kartiksubbarao/augeas_insert_16383
...
Update augeas_cfg.py
2015-05-21 11:03:42 -06:00
Justin Findlay
55c9245075
Merge pull request #24025 from jayeshka/timezone-unit-test
...
adding timezone unit test case
2015-05-21 10:50:53 -06:00
Justin Findlay
e243617659
Merge pull request #24023 from jayeshka/mongodb_database-states-unit-test
...
adding states/mongodb_database unit test case
2015-05-21 10:49:17 -06:00
Justin Findlay
b377bd93e6
Merge pull request #24022 from jayeshka/modjk_worker-states-unit-test
...
adding states/modjk_worker unit test case
2015-05-21 10:48:29 -06:00
Justin Findlay
dbbd05ba76
Merge pull request #24015 from YanChii/solarisips-docs2
...
minor improvement of solarisips docs & fix typos
2015-05-21 10:43:43 -06:00
Justin Findlay
b74c70b77c
Merge pull request #24013 from jbq/issue_24012
...
Fix enabling a service on Ubuntu #24012
2015-05-21 10:40:49 -06:00
Nicole Thomas
c938d00e9c
Merge pull request #24027 from wfhg/develop
...
Add baseurl to salt.modules.zypper.mod_repo
2015-05-21 09:20:57 -06:00
Erik Johnson
2b74e81178
Merge pull request #24011 from ticosax/dockerng-ports-not-expose
...
[dockerng] Tests for #23975 and apply same logic for `ports` and `port_bindings`
2015-05-21 10:00:22 -05:00
Jayesh Kariya
1ec33e22a7
removed assertion error
2015-05-21 18:57:58 +05:30
Wout Maaskant
9d22aff3c7
Added baseurl as alias for url and mirrorlist in salt.modules.zypper.mod_repo.
2015-05-21 14:11:25 +02:00
Jayesh Kariya
5a9ac7effb
adding states/mongodb_database unit test case
2015-05-21 17:09:20 +05:30
Jayesh Kariya
05c0a985db
adding states/modjk_worker unit test case
2015-05-21 17:07:01 +05:30
Jayesh Kariya
16ecb28950
adding timezone unit test case
2015-05-21 17:05:56 +05:30
Dmitry Kuzmenko
702ad84a82
Add 'zmq_monitor' default config value
2015-05-21 12:23:55 +03:00
YanChii
f14381daed
minor improovement of solarisips docs & fix typos
2015-05-21 11:21:44 +02:00
Jean-Baptiste Quenot
868db3a50a
Fix enabling a service on Ubuntu #24012
...
This reverts commit bd6f5ea370
2015-05-21 10:56:30 +02:00
Nicolas Delaby
5f8f24b655
Related to #23975 and apply same logic for ports and port_bindings
2015-05-21 09:49:21 +02:00
Justin Findlay
229594d33f
Merge pull request #23999 from neogenix/develop-23950
...
Develop branch fix for #23950
2015-05-20 22:19:50 -06:00
Justin Findlay
17615ddc87
Merge pull request #24000 from wt/remove_yaml_terminator
...
Remove yaml terminator in yaml formatter.
2015-05-20 20:52:59 -06:00
Justin Findlay
701c51ba7a
Merge pull request #24005 from msteed/issue-23776
...
issue #23776
2015-05-20 19:55:34 -06:00
Michael Steed
62e67d8ca0
issue #23776
...
Update caller's present set in Maintenance.handle_presence()
2015-05-20 17:57:30 -06:00
Mathieu Le Marec - Pasquet
319282af5f
lint
2015-05-21 01:56:56 +02:00
Stephen Spencer
e240c9edce
tone down the "'s
2015-05-20 18:52:55 -05:00
Stephen Spencer
d2629c138f
similar fixes for pop()
2015-05-20 18:52:54 -05:00
Stephen Spencer
ee8be7529c
adjustments to facilitate insertion and deletion of items containing
...
quotation marks
. _quote_escape(): (new) subs ' for '' for inbound item and returns item
. insert: swap ' for ''' on single-item processing
run string and list items through _quote_escape() to provide
proper sqlite3 escaping of single-quote (' -> '')
. delete: swap ' for """ on single-item processing
ibid: _quote_escape()
2015-05-20 18:52:54 -05:00
