Thomas S Hatch
dee3589edb
Merge pull request #24306 from techhat/softlayerprice
...
Allow Softlayer HW driver to display pricing information
2015-06-01 14:40:42 -06:00
Joseph Hall
d72832077f
Fix EC2 refs
2015-06-01 13:39:55 -06:00
Colton Myers
e9b3bbb588
Merge pull request #23982 from makinacorpus/lxc_path
...
lxc: path support
2015-06-01 13:38:52 -06:00
Joseph Hall
62b982b808
Allow Softlayer HW driver to display pricing information
2015-06-01 13:31:24 -06:00
Mathieu Le Marec - Pasquet
f50e6dafa8
lxc: path support
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-06-01 20:22:57 +02:00
Thomas S Hatch
438a024e68
Merge pull request #24293 from edouardb/scaleway-provider
...
Added Scaleway cloud provider
2015-06-01 11:47:24 -06:00
Thomas S Hatch
5eae6de609
Merge pull request #24282 from The-Loeki/better-ipv6
...
Final part of #22080
2015-06-01 11:46:15 -06:00
Thomas S Hatch
ac1134af22
Merge pull request #24188 from aneeshusa/add-sqlite-pillar
...
Add sqlite3 pillar
2015-06-01 11:45:15 -06:00
Edouard Bonlieu
b85deb3092
Fix Python 3 compatibility
2015-06-01 16:26:52 +02:00
Edouard Bonlieu
84d95aee13
Rework array building in list_nodes_full for python2.6 compatibility
2015-06-01 14:59:24 +02:00
Edouard Bonlieu
f31260609c
Remove unused import
2015-06-01 14:56:09 +02:00
Edouard Bonlieu
dcebb38627
/"/'
2015-06-01 09:57:21 +02:00
Justin Findlay
9514964075
Merge pull request #24278 from rallytime/boto_delete_policies_doc
...
Add arg documentation for delete_policies
2015-05-31 22:28:49 -06:00
Justin Findlay
40da36b950
Merge pull request #24270 from jodv/sync_log_handlers
...
Add log_handlers syncing to saltutil module
2015-05-31 22:27:30 -06:00
Justin Findlay
4e48d3e222
Merge pull request #24285 from davidjb/patch-2
...
Document availability of arguments to file states
2015-05-31 22:26:32 -06:00
David Beitey
c2bc1f8303
Document availability of arguments to file states
...
Mention in the documentation that all arguments to a Python-rendered templated file will be made available as globals to the Python script.
2015-06-01 11:29:57 +10:00
Ronald van Zantvoort
2a2210b437
Fix subnets
2015-05-31 23:56:28 +02:00
Ronald van Zantvoort
d1e9e5434f
Revert addition of oddly behaving tests
2015-05-31 23:31:49 +02:00
Ronald van Zantvoort
9682388d61
Pylint fixes
2015-05-31 22:51:15 +02:00
Ronald van Zantvoort
35a591903a
* PyLint fixes
...
* Make _subnets() IP agnostic
* Add subnets6
* Fix CkMinions with the same <ugh> ipcidr matcher code
2015-05-31 22:21:08 +02:00
Ronald van Zantvoort
15e85184dc
Move loading of ipaddress module where it belongs
2015-05-31 22:18:15 +02:00
Ronald van Zantvoort
65096c407b
Stoopid typos
2015-05-31 21:03:40 +02:00
Ronald van Zantvoort
07af81e817
Try adding a few extra unit tests
...
First drop of final fix for #22080
2015-05-31 20:52:30 +02:00
Ronald van Zantvoort
f36a3d9403
Improve calculate_subnet further, rename to calc_net
2015-05-31 19:12:16 +02:00
Jeremy Rosenbaum
486e140da7
add "versionadded" to sync_log_handlers docstring
2015-05-31 09:59:57 -07:00
Ronald van Zantvoort
d69659e179
Deprecate utils.ip_in_subnet
2015-05-31 18:45:14 +02:00
Ronald van Zantvoort
91b7258643
get_net_start IP agnostic
2015-05-31 18:44:46 +02:00
Ronald van Zantvoort
f14b462155
Refactor ip_addr functions to utilize ipaddress library & become properly loopback aware
2015-05-31 17:50:39 +02:00
Nicole Thomas
7ee303abd9
Merge pull request #24271 from randybias/patch-1
...
Fixed the setup instructions
2015-05-31 09:46:54 -06:00
rallytime
3ed3dd6f47
Add arg documentation for delete_policies
...
Refs #24218
2015-05-31 09:41:46 -06:00
Nicole Thomas
aa01493eb2
Merge pull request #24264 from techhat/ec2prices
...
Allow EC2 driver to display pricing information
2015-05-31 09:29:00 -06:00
Nicole Thomas
d8ab5655dd
Merge pull request #24266 from techhat/rallydev
...
Add execution module for RallyDev
2015-05-31 09:28:50 -06:00
Nicole Thomas
900470eef7
Merge pull request #24265 from techhat/bamboohr
...
Add execution module for BambooHR
2015-05-31 09:28:38 -06:00
Joseph Hall
59b99cecbf
Adding versionadded
2015-05-31 07:12:07 -06:00
Joseph Hall
6562a7abac
Adding versionadded
2015-05-31 07:10:43 -06:00
Joseph Hall
d1df6e1a76
Adding versionadded
2015-05-31 07:09:42 -06:00
Nicole Thomas
e7542e7a38
Merge pull request #24236 from jdsieci/develop
...
RedHat IPv6 static routes
2015-05-30 21:34:24 -06:00
Randy Bias
037f7e26a4
Fixed the setup instructions
...
Fixed the instructions in the code to match the website (http://docs.saltstack.com/en/latest/topics/cloud/gce.html ).
2015-05-30 17:13:27 -07:00
Jeremy Rosenbaum
b15dafb529
Add log_handlers syncing to saltutil module
...
Right now, it doesn't look like there's any non-manual way to set up external logging handlers on minions. This allows syncing log_handlers to minions the same way as any other extension module and includes any external logging handlers in `saltutil.sync_all`
2015-05-30 12:31:55 -07:00
Justin Findlay
4e19be2b7d
Merge pull request #24267 from aneeshusa/add-nice-error-msg-for-permission-denied
...
Have a nice error message if running as the wrong user.
2015-05-30 11:38:31 -06:00
Justin Findlay
a71d3f95d1
Merge pull request #24263 from luciddg/docs-import-yaml
...
Correct usage of import_yaml in formula documentation
2015-05-30 11:36:42 -06:00
Justin Findlay
01694b7fa1
Merge pull request #24261 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-30 11:35:00 -06:00
Aneesh Agrawal
6b07aa635b
Have a nice error message if running as the wrong user.
...
This is a nice-to-have to avoid exception tracebacks in the output
if running Salt as the wrong user, which I tend to do by accident a lot.
The actual exception message is no longer shown because it is redundant.
2015-05-30 01:54:55 -04:00
Joseph Hall
c79b4c622e
Linting
2015-05-29 20:36:36 -06:00
Joseph Hall
c54a09765c
Add execution module for RallyDev
2015-05-29 19:40:27 -06:00
Joseph Hall
fa7e46e30d
Add execution module for BambooHR
2015-05-29 19:39:53 -06:00
Joseph Hall
f6af4407f8
Allow EC2 driver to display pricing information
2015-05-29 19:17:38 -06:00
Jason Thigpen
37775a5fa6
Correct usage of import_yaml in formula documentation
2015-05-29 17:12:59 -07:00
Jerzy Drozdz
2f3d0298af
pylint volation fixes
2015-05-30 02:04:49 +02:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
