Commit Graph

52221 Commits

Author SHA1 Message Date
Jayesh Kariya
4b7be9ffb8 adding rest_package unit test case 2015-04-28 18:04:43 +05:30
rallytime
feb10e09f0 Remove os.popen call in colletor.py 2015-04-28 06:26:37 -06:00
Nitin Madhok
a9c7a03654 Doc fixes 2015-04-28 07:15:13 -04:00
Nitin Madhok
9be470e027 Refactoring create_snapshot(), revert_to_snapshot() and remove_all_snapshots() 2015-04-28 06:14:36 -04:00
Kevin Boulain
6560839d92 fix parsing the output of parted 2015-04-28 11:01:26 +02:00
Nitin Madhok
3a9ceba2f1 Adding task polling of start, stop, suspend and reset actions in VMware cloud driver 2015-04-28 02:32:47 -04:00
Nitin Madhok
85f75bfaf2 Merge pull request #10 from rmgoodberlet/vmware-cloud-driver
Added snapshot related functions (create, revert, consolidate)
2015-04-28 01:26:50 -04:00
Justin Findlay
7a805b545d Merge pull request #23096 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-04-27 23:23:08 -06:00
Colton Myers
d4a257e5b7 Merge pull request #14 from jfindlay/dev_lint
merge 2015.2 -> develop lint
2015-04-27 22:11:55 -06:00
Justin Findlay
cd472ead00 merge 2015.2 -> develop lint 2015-04-27 22:07:32 -06:00
Justin Findlay
b0f4b28487 Merge pull request #23114 from rallytime/remove_ubuntu_zmq4_docs
Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages
2015-04-27 21:59:24 -06:00
Justin Findlay
db4fd0bf32 Merge pull request #23107 from rallytime/bp-23024
Backport #23024 to 2015.2
2015-04-27 21:58:56 -06:00
Justin Findlay
399857f20b Merge pull request #23108 from rallytime/bp-23097
Backport #23097 to 2014.7
2015-04-27 21:58:05 -06:00
Justin Findlay
5541537c32 Merge pull request #23112 from basepi/mysql_returner_save_load
[2014.7] Backport #22199 to fix mysql returner save_load errors
2015-04-27 21:55:44 -06:00
Justin Findlay
99790f18f2 Merge pull request #23115 from UtahDave/2015.2local
import and namespace _mkstemp_copy
2015-04-27 21:54:04 -06:00
Nicole Thomas
dfe2066b25 Merge pull request #23113 from saltstack/revert-22925-bp-22895
Revert "Backport #22895 to 2014.7"
2015-04-27 21:27:29 -06:00
Sergey Kizunov
6a5624db11 Add option to read additional arguments from stdin
Added a boolean command line option called '--args-stdin'.
When this is used, it will read addional options and/or arguments from
stdin.

Why is this needed?

On Windows, the maximum command line length for CreateProcess is 32K
and for 'cmd.exe' is 8K. Reference:
http://blogs.msdn.com/b/oldnewthing/archive/2003/12/10/56028.aspx

On Linux, the limitation is generally much higher and isn't an issue.
I have run into this limitation in 2 different ways:

1) When invoking the 'salt' command and explicitly listing each minion.
When the minion list gets close to 1000, this limitation will be hit.

2) When invoking the 'salt' or 'salt-call' command and passing a large
job argument. We have our own plug-in modules that implement more job
functions. Some of these functions take a configuration for a minion.
That configuration routinely exceeds 32K.

By passing options and/or arguments through stdin, I can avoid the
problems outlined above.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-04-27 19:35:42 -05:00
David Boucha
bb33d59251 import and namespace _mkstemp_copy
Fixes #22779
2015-04-27 17:30:30 -06:00
Nicole Thomas
b957ea8977 Revert "Backport #22895 to 2014.7" 2015-04-27 17:11:57 -06:00
Colton Myers
0127012ed3 Put a bandaid on the save_load duplicate issue
Ref #22171
2015-04-27 17:08:55 -06:00
rallytime
f6cc7c8f8a Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages
Removed the chrislea ppa third party installation information. This
shouldn't be needed anymore for any Ubuntu package after 2014.7.5.
2015-04-27 15:57:41 -06:00
Erik Johnson
1860fffd68 Don't run os.path.relpath() if repo doesn't have a "root" param set 2015-04-27 16:21:56 -05:00
Nicole Thomas
21515f3c23 Merge pull request #23094 from terminalmage/issue23013
pygit2: disable cleaning of stale refs for authenticated remotes
2015-04-27 14:51:28 -06:00
Mathieu Le Marec - Pasquet
8df572f2ae lxc.set_dns: handle also resolvconf based installs 2015-04-27 22:48:14 +02:00
rallytime
fa889845df Change s3 to s3fs in fileserver_roots docs example
Fixes #23085
2015-04-27 14:46:16 -06:00
Ronald van Zantvoort
539946f4c9 minion nodes should parse minion configs
Small copy/paste typo there
2015-04-27 14:43:49 -06:00
Justin Findlay
11087e2179 Merge pull request #23099 from garethgreenaway/schedule_adding_after_option
Additions to scheduler
2015-04-27 12:55:30 -06:00
Justin Findlay
cdbb20b75b Merge pull request #23095 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-27 12:15:20 -06:00
Justin Findlay
308e4b5316 Merge pull request #23097 from rallytime/fix-23085
Change s3 to s3fs in fileserver_roots docs example
2015-04-27 12:12:10 -06:00
Joseph Hall
556215e9ce Merge pull request #23069 from nmadhok/vmware-cloud-driver
Adding list_hbas(), list_dvs(), list_vapps(), create_folder(), enter_maintenance_mode() and exit_maintenance_mode function in vmware cloud driver
2015-04-27 11:38:56 -06:00
Gareth J. Greenaway
b6b1b8ad22 Adding the ability to add an option to have jobs begin running "after" a specified time or date. 2015-04-27 10:22:20 -07:00
Justin Findlay
e5751f401b Merge pull request #23092 from rallytime/pylint-dev
Pylint dev
2015-04-27 11:05:59 -06:00
Matthew Williams
796fd603e8 use Mixin for Subnets test case in boto_vpc state module tests 2015-04-27 16:56:07 +00:00
Matthew Williams
68c7ba77a0 fix lint in boto_vpc execution module tests 2015-04-27 16:55:19 +00:00
Matthew Williams
d976c83261 states.boto_vpc: fix bug 2015-04-27 16:54:19 +00:00
rallytime
0b73397916 Change s3 to s3fs in fileserver_roots docs example
Fixes #23085
2015-04-27 10:42:18 -06:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
Colton Myers
624d16ccfc Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    salt/modules/file.py
2015-04-27 10:12:27 -06:00
Erik Johnson
aaf7b04f79 pygit2: disable cleaning of stale refs for authenticated remotes
Fixes #23013.
2015-04-27 11:10:53 -05:00
Matthew Williams
76f739d7c7 boto_vpc: lint 2015-04-27 16:05:55 +00:00
rallytime
39207ea135 Use salt.utils.fopen instead of open 2015-04-27 09:54:37 -06:00
Matthew Williams
682b4940c8 loader: remove extraneous pass stmt 2015-04-27 15:47:29 +00:00
Vinta
16abca5938 use string formatting instead of string substitution 2015-04-27 23:37:40 +08:00
Vinta
c57c5b3049 remove ASCII art comments 2015-04-27 23:31:51 +08:00
Mike Place
142be494d5 Stringify version number before lstrip 2015-04-27 09:30:20 -06:00
Justin Findlay
bcad307c38 Merge pull request #23084 from jayeshka/rbenv-unit-test
adding rbenv unit test case
2015-04-27 09:29:54 -06:00
Justin Findlay
7daffb11f0 Merge pull request #23083 from jayeshka/chef-states-unit-test
adding states/chef unit test case
2015-04-27 09:29:02 -06:00
rallytime
d1f75be712 Python 3 compat for query.py 2015-04-27 09:27:57 -06:00
Justin Findlay
846f8b7ffb Merge pull request #23082 from jayeshka/boto_sqs-states-unit-test
adding states/boto_sqs unit test case
2015-04-27 09:26:25 -06:00
Justin Findlay
fc6ca0c117 Merge pull request #23081 from jayeshka/boto_sns-states-unit-test
adding states/boto_sns unit test case
2015-04-27 09:25:57 -06:00