rallytime
fba0de8bfa
Update minimum version for pycrypto
2015-05-21 16:49:34 -06:00
Nicole Thomas
42b87f1049
Merge pull request #24046 from rallytime/remove_key_test
...
Remove key management test from digital ocean cloud tests
2015-05-21 16:32:04 -06:00
Nicole Thomas
eff54b1c5a
Merge pull request #24044 from cro/pgjsonb
...
Remove spurious log message, fix typo in doc
2015-05-21 16:31:49 -06:00
Nicole Thomas
ac32000b5d
Merge pull request #24001 from msteed/issue-23883
...
issue #23883
2015-05-21 14:32:30 -06:00
rallytime
1d031caa78
Remove key management test from digital ocean cloud tests
...
The create_key function was added to develop, but isn't present in 2015.5.
2015-05-21 13:37: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
C. R. Oldham
de0663314a
Remove spurious log message, fix typo in doc
2015-05-21 13:26:30 -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
Wout Maaskant
37d25d8bc6
Added baseurl as alias for url and mirrorlist in salt.modules.zypper.mod_repo.
2015-05-21 11:09:48 -06:00
YanChii
6bfaa94a8c
minor improovement of solarisips docs & fix typos
2015-05-21 11:06:51 -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
Daniel Fayette
ea00d3e786
Fix ssh_auth test mode, compare lines not just key
...
Intened to fix #19598
2015-05-21 10:55:14 -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
Mathieu Le Marec - Pasquet
412b39b802
Fix providers handling
...
This fixes #24017
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-21 15:00:23 +02:00
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
Nicole Thomas
17b7c0b741
Merge pull request #23996 from neogenix/2015.5-23950
...
iptables state generates a 0 position which is invalid in iptables cli #23950
2015-05-20 16:44:27 -06:00
Michael Steed
bea97a8b98
issue #23883
...
pass opts to MasterEvent constructor
2015-05-20 15:52:35 -06:00
Nicole Thomas
4cb877307c
Merge pull request #23994 from rallytime/skip_test_ubuntu_15
...
Skip the gpodder pkgrepo test for Ubuntu 15 - they don't have vivid ppa up yet
2015-05-20 15:18:21 -06:00
Warren Turkal
a7dd113a96
Remove yaml terminator in yaml formatter.
2015-05-20 14:16:40 -07:00
Justin Findlay
2422760ebd
Merge pull request #23998 from rallytime/release_notes
...
Update release note for 2015.5.1
2015-05-20 14:58:55 -06:00
Patrick
dd13b99663
Develop branch fix for #23950
2015-05-20 14:53:39 -06:00
rallytime
113c6049f5
Update release note for 2015.5.1
2015-05-20 14:50:08 -06:00
Mathieu Le Marec - Pasquet
1dc67e5678
lxc: versionadded
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-20 22:43:57 +02:00
Patrick
ad417a57c2
fix for #23950
2015-05-20 14:36:25 -06:00
Mathieu Le Marec - Pasquet
fcad7cb804
lxc: states improvments
...
- support for lxc_profiles
- support for stopping destroy
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-20 22:35:04 +02:00
Mathieu Le Marec - Pasquet
644bd729f7
lxc: more consistence for profiles
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-20 22:35:04 +02:00
Mathieu Le Marec - Pasquet
139372c055
lxc: remove merge cruft
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-20 22:35:04 +02:00
