50225 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Seth House	ef3893d4de	Updated module index pages for each of the module types	2015-04-03 12:39:13 -06:00
jfindlay	cfec0b403f	Merge pull request #22331 from rallytime/fix-syntax-error ... Fix python 2.6 syntax error in salt/grains/core.py	2015-04-03 10:22:50 -06:00
Thomas S Hatch	74bc55a5f8	Merge pull request #22326 from rallytime/fix_network_unittest ... Patch decorators.which for network_test.test_arp	2015-04-03 09:44:37 -06:00
Thomas S Hatch	d00a0e2c47	Merge pull request #22324 from rallytime/versionadded_firewalld ... Add some versionadded infos to new firewalld funcs	2015-04-03 09:44:00 -06:00
Thomas S Hatch	75d21cca21	Merge pull request #22323 from rallytime/merge-22248 ... Merge #22248 with pylint fix	2015-04-03 09:43:09 -06:00
rallytime	ba440eda1a	Fix python 2.6 syntax error in salt/grains/core.py ... Fixes #22327	2015-04-03 09:14:31 -06:00
Mike Place	84fb57ca43	Merge pull request #22330 from cachedout/log_trace ... More to trace per comment in #22303	2015-04-03 08:59:18 -06:00
Mike Place	65b1183000	More to trace per comment in #22303	2015-04-03 08:58:28 -06:00
rallytime	39f3ff526a	Patch decorators.which for network_test.test_arp ... If salt.utils.which('arp') is None, we shouldn't fail this test. This fixes the Arch and Fedora test failures on develop	2015-04-03 08:28:10 -06:00
Nicole Thomas	f65f6471a4	Merge pull request #22325 from rallytime/fix-pylint ... Fix pylint error for develop	2015-04-03 08:01:06 -06:00
rallytime	ea25e6c5ba	Fix pylint error for develop	2015-04-03 07:06:51 -06:00
rallytime	47a4f04168	Add some versionadded infos to new firewalld funcs	2015-04-03 06:45:48 -06:00
Nicole Thomas	c22695d847	Merge pull request #22292 from dmyerscough/firewalld-new-features ... New features and bug fixes	2015-04-03 06:41:48 -06:00
rallytime	fa434c54cc	Whitespace fix and remove duplicate import	2015-04-03 06:38:19 -06:00
Damian Myerscough	d7d669a42f	Fix Lint Errors	2015-04-02 17:06:05 -07:00
Thomas S Hatch	4374f4c6e4	Merge pull request #22310 from rallytime/rc2_sidebar ... Update sidebar and release candidate docs for rc2	2015-04-02 17:45:55 -06:00
Thomas S Hatch	4f881c405b	Merge pull request #22305 from cachedout/carbon_event ... Stream beacons and other events into Graphite	2015-04-02 17:43:23 -06:00
Nicole Thomas	3e6399d192	Merge pull request #22303 from dmyerscough/22204-additional-logging ... Show what grains are being loaded when running debug level	2015-04-02 17:20:42 -06:00
Mike Place	6e77d854c8	Merge pull request #22309 from rallytime/file-line-versionadded ... Add versionadded directive to file.line state	2015-04-02 17:11:25 -06:00
Mike Place	625cc262b4	Merge pull request #22267 from The-Loeki/smbios-module ... modify _hw core grains to use the new smbios module, add system uuid	2015-04-02 17:10:03 -06:00
rallytime	c45f64cb8d	Add versionadded directive to file.line state	2015-04-02 17:07:45 -06:00
rallytime	5cd2db23eb	Update sidebar and releasecandidate docs for rc2	2015-04-02 16:42:01 -06:00
Damian Myerscough	485385d35f	Show what grains are being loaded when running debug level	2015-04-02 15:32:23 -07:00
Mike Place	121d93776d	Lint	2015-04-02 16:10:12 -06:00
Mike Place	03be4f9e1b	Change the load beacon slightly to normalize the data	2015-04-02 16:06:47 -06:00
jfindlay	5376a13ca9	Merge pull request #22299 from rallytime/pylinting-develop ... Python 3 compatibility changes for develop	2015-04-02 15:24:32 -06:00
Mike Place	f61ca2103a	It works!	2015-04-02 14:13:07 -06:00
rallytime	9c2ebd193c	Python 3 compatibility changes for develop	2015-04-02 14:04:28 -06:00
Thomas S Hatch	b0f4077b1a	Merge pull request #22291 from ticosax/dockerio-fix-already-exists ... states.dockerio: Fix Bug introduced in cc1cd22471	2015-04-02 12:53:27 -06:00
Thomas S Hatch	368bfa377e	Merge pull request #22289 from achernev/develop ... Expand glob patterns in the path argument of file.find	2015-04-02 12:53:07 -06:00
Mike Place	f13647065e	Merge pull request #22293 from cachedout/ret_key_error ... Avoid key error when returner does not have func	2015-04-02 12:13:20 -06:00
Mike Place	75e4e415cd	Avoid key error when returner does not have func	2015-04-02 10:40:44 -06:00
Damian Myerscough	e81ffa190c	New features and bug fixes	2015-04-02 09:27:20 -07:00
Nicolas Delaby	46481d39b4	Fix Bug introduce in cc1cd22471 ... Once the container is destroyed, put the flag `already_exists` to `False` to let the new container be created.	2015-04-02 18:24:48 +02:00
Anton Chernev	fdf8825477	Preserve previous behaviour when doing glob expansion in file.find	2015-04-02 16:47:35 +01:00
Anton Chernev	56b88f2181	Expand glob patterns in the path argument of file.find	2015-04-02 16:37:30 +01:00
Mike Place	61b5ada0b5	Merge pull request #22281 from claudiupopescu/boto_vpc_routes_support ... Boto VPC routes support	2015-04-02 08:49:24 -06:00
Mike Place	5ae09184e0	Merge pull request #22283 from tsaridas/add_test_boto_iam ... Fix for #22273	2015-04-02 08:41:59 -06:00
jfindlay	d9369b1be7	Merge pull request #22262 from basepi/merge-forward-develop ... Merge forward from 2015.2 to develop	2015-04-02 08:36:06 -06:00
jfindlay	4ee34f0f62	Merge pull request #22282 from rahulhan/puppet_unit_test ... Adding puppet.py unit test cases	2015-04-02 07:55:38 -06:00
jfindlay	65d685ad2a	Merge pull request #22278 from jayeshka/network-unit-test ... adding network unit test case.	2015-04-02 07:52:12 -06:00
Joseph Hall	ba3f6bc32c	Merge pull request #22258 from nmadhok/vmware-cloud-driver ... Creating vmware cloud driver	2015-04-02 07:31:50 -06:00
Andrea-Redi Tsarida	cc581da858	Fix for #22273	2015-04-02 14:06:17 +02:00
Claudiu Popescu	1012d83e0b	Fixes pylint wrong indentation	2015-04-02 13:26:34 +02:00
Rahul Handay	78667caa68	Adding puppet.py unit test cases	2015-04-02 16:40:39 +05:30
Claudiu Popescu	75c49de5ee	Added keys to some function calls	2015-04-02 12:57:25 +02:00
Nitin Madhok	5a5f394eba	Forgot to remove trailing spaces	2015-04-02 06:56:49 -04:00
Claudiu Popescu	1aef945710	Adds support for routes in route_table_present	2015-04-02 12:56:00 +02:00
Nitin Madhok	2a7c23ec83	Fixing lint and formatting docs	2015-04-02 06:28:32 -04:00
Jayesh Kariya	1a9e6aab75	adding network unit test case.	2015-04-02 12:25:48 +05:30