Rahul Handay
|
41f25642d1
|
Removed pylint errors
|
2015-03-26 12:48:17 +05:30 |
|
rahulha
|
430476e5a6
|
adding bluez unit test case
|
2015-03-26 11:30:16 +05:30 |
|
jfindlay
|
32823a7431
|
Merge pull request #22008 from dmyerscough/create-snapshots-vmware
Allow users to create snapshots of their virtual machines
|
2015-03-25 17:44:18 -06:00 |
|
Damian Myerscough
|
478be3ebb2
|
Catch VIException
|
2015-03-25 15:23:13 -07:00 |
|
jfindlay
|
b965a51365
|
Merge pull request #22013 from dmyerscough/snapshop-list-more-details
Snapshop list more details
|
2015-03-25 15:52:51 -06:00 |
|
Damian Myerscough
|
53f90704c5
|
Adding version
|
2015-03-25 13:30:43 -07:00 |
|
Damian Myerscough
|
25d6c03b2b
|
List more details about snapshots such as creation date/state/description etc.
|
2015-03-25 13:29:09 -07:00 |
|
Damian Myerscough
|
2e45e39aa9
|
Adding version
|
2015-03-25 13:26:16 -07:00 |
|
Damian Myerscough
|
b7231a1b3d
|
Allow users to create snapshots of their virtual machines
|
2015-03-25 12:44:52 -07:00 |
|
jfindlay
|
add04c62b1
|
Merge pull request #21999 from basepi/merge-forward-develop
Merge forward from 2014.7 to 2015.2
|
2015-03-25 13:06:26 -06:00 |
|
Colton Myers
|
b0fe5cc955
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
salt/fileclient.py
salt/minion.py
tests/unit/pyobjects_test.py
|
2015-03-25 12:04:30 -06:00 |
|
Thomas S Hatch
|
2c6753941a
|
Merge pull request #21945 from ticosax/docker.running.signal
Enable soft reload for docker containers
|
2015-03-25 08:41:58 -06:00 |
|
Thomas S Hatch
|
c54c6ceef8
|
Merge pull request #21983 from techhat/issue21917
Pass auth from fileclient to http.query()
|
2015-03-25 08:41:46 -06:00 |
|
Thomas S Hatch
|
23502fa792
|
Merge pull request #21973 from deuscapturus/patch-2
Update fileclient.py
|
2015-03-25 08:41:02 -06:00 |
|
Nicole Thomas
|
47482718e0
|
Merge pull request #21984 from techhat/winstr
Retries should be int, not str
|
2015-03-25 08:35:04 -06:00 |
|
Nicole Thomas
|
dcf8e68d7f
|
Merge pull request #21976 from jayeshka/pam-unit-test
adding pam unit test
|
2015-03-25 08:34:36 -06:00 |
|
Nicole Thomas
|
2b8789f5ab
|
Merge pull request #21970 from jayeshka/runit-unit-test
adding runit unit test
|
2015-03-25 08:34:17 -06:00 |
|
Joseph Hall
|
07903adb2f
|
Retries should be int, not str
|
2015-03-25 07:16:59 -06:00 |
|
Joseph Hall
|
dfe328d334
|
Pass auth from fileclient to http.query()
|
2015-03-25 07:12:14 -06:00 |
|
Jayesh Kariya
|
bb80e1d608
|
adding pam unit test
|
2015-03-25 13:46:11 +05:30 |
|
Nicolas Delaby
|
4c23581505
|
enable soft reload for running containers
|
2015-03-25 09:09:49 +01:00 |
|
Nicolas Delaby
|
ee7542ed44
|
transmit signal argument to docker's client.kill()
|
2015-03-25 09:09:49 +01:00 |
|
Theodore Cowan
|
3c883abab9
|
Update fileclient.py
https://github.com/saltstack/salt/issues/21917
|
2015-03-25 01:08:36 -06:00 |
|
Jayesh Kariya
|
39e4b7f8e3
|
adding runit unit test
|
2015-03-25 11:14:18 +05:30 |
|
Joseph Hall
|
fa4c1d74ea
|
Merge pull request #21966 from dmyerscough/21280-list-snapshots
Display all VMs with snapshots and list the names of the snapshots
|
2015-03-24 19:49:54 -06:00 |
|
Joseph Hall
|
30eb9f2f58
|
Merge pull request #21960 from twangboy/win_ssl_19969
Added certifi to fix ssl bug in windows
|
2015-03-24 19:37:02 -06:00 |
|
Nicole Thomas
|
46e9ef246b
|
Merge pull request #21964 from rallytime/pylint-y
Fix python 3 compatiblity for hg_pillar on develop
|
2015-03-24 19:27:56 -06:00 |
|
Damian Myerscough
|
b9f26c1a26
|
Display all VMs with snapshots and list the names of the snapshots
|
2015-03-24 16:59:03 -07:00 |
|
twangboy
|
79f81f8ac3
|
Added HAS_CERTIFI check
|
2015-03-24 17:30:56 -06:00 |
|
twangboy
|
c6f402a511
|
Added certifi to fix ssl bug in windows
|
2015-03-24 17:30:54 -06:00 |
|
rallytime
|
cd97aab3e9
|
Fix python 3 compatiblity for hg_pillar on develop
|
2015-03-24 17:05:12 -06:00 |
|
jfindlay
|
96e56bfc2a
|
Merge pull request #21959 from giannello/patch-1
Changed argument name
|
2015-03-24 17:01:45 -06:00 |
|
Giuseppe Iannello
|
b2dc598b01
|
Changed argument name
Renamed an argument to align to the naming convention of the render() method in all the other renderers. Incidentally fixes #21956
|
2015-03-24 22:56:04 +01:00 |
|
Mike Place
|
53846aa284
|
Merge pull request #21958 from cachedout/2015_2_mm_note
Add known multimaster issue to 2015.2 notes
|
2015-03-24 15:50:16 -06:00 |
|
Mike Place
|
98642d7b87
|
Add known multimaster issue to 2015.2 notes
|
2015-03-24 15:49:58 -06:00 |
|
jfindlay
|
05fdea4069
|
Merge pull request #21954 from rallytime/return_config_docs
Added versionadded tags to --return_config
|
2015-03-24 15:32:59 -06:00 |
|
jfindlay
|
ecd2f70a85
|
Merge pull request #21951 from johntron/patch-1
Fix second `unless` example
|
2015-03-24 14:31:41 -06:00 |
|
jfindlay
|
060df316a2
|
Merge pull request #21950 from dmyerscough/21610-fix-stacktrace-on-ctrl-c
Gracefully stop the Salt Master
|
2015-03-24 14:29:32 -06:00 |
|
rallytime
|
6486d9794b
|
More returner doc formattting and versionadded tags
|
2015-03-24 14:27:01 -06:00 |
|
rallytime
|
5c37ebb634
|
Add some versionadded tags to --return_config and clean up formatting
Fixes #21933
|
2015-03-24 14:09:41 -06:00 |
|
jfindlay
|
40b99a2a11
|
Merge pull request #21947 from dmyerscough/20625-Fixing-invalid-syntax
Ensure nginx config check passes by checking the exit status
|
2015-03-24 13:11:50 -06:00 |
|
jfindlay
|
8e4bf33404
|
Merge pull request #21930 from ptonelli/develop
add hg_pillar similar to git_pillar
|
2015-03-24 13:10:53 -06:00 |
|
John Syrinek
|
6558d9e6d7
|
Fix unless example
The second `unless` example failed to compile
|
2015-03-24 14:02:27 -05:00 |
|
Damian Myerscough
|
bb98b093bd
|
Gracefully stop the Salt Master
|
2015-03-24 11:55:35 -07:00 |
|
jfindlay
|
5bfd0275ed
|
Merge pull request #21943 from thatch45/grainslog
ignore grains outputter presence error
|
2015-03-24 12:44:31 -06:00 |
|
jfindlay
|
0675892fa5
|
Merge pull request #21942 from aspyatkin/fix-pip-install-editable
Do not parse state name with pip in editable mode
|
2015-03-24 12:43:28 -06:00 |
|
Damian Myerscough
|
ac93e11a49
|
Ensure nginx config check passes by checking the exit status.... Nginx writes messages to stderr even when there are no errors
|
2015-03-24 11:09:23 -07:00 |
|
Paul Tonelli
|
9bf65bde80
|
add version annotations
|
2015-03-24 19:08:42 +01:00 |
|
Thomas S Hatch
|
ddefe550b4
|
ignore grains outputter presence error
|
2015-03-24 10:44:39 -06:00 |
|
Paul Tonelli
|
ab736e8f48
|
remove empty functions
|
2015-03-24 17:40:24 +01:00 |
|