Ronald van Zantvoort
f36a3d9403
Improve calculate_subnet further, rename to calc_net
2015-05-31 19:12:16 +02: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
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
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
Thomas S Hatch
742cf7e4dd
Merge pull request #24256 from rallytime/remove_digital_ocean_v1
...
Deprecate digital_ocean.py in favor of digital_ocean_v2.py
2015-05-29 17:09:12 -06:00
Thomas S Hatch
3d885c04f0
Merge pull request #24257 from jfindlay/pkg_tests
...
fix pkg mod integration test on ubuntu 12.04
2015-05-29 17:09:00 -06:00
Jerzy Drozdz
ded5002f41
Return values fixes
2015-05-30 01:04:32 +02:00
Jerzy Drozdz
9eb9892516
Changed return values and assertions to lists
2015-05-30 01:03:43 +02:00
Thomas S Hatch
a28515aa2c
Merge pull request #23060 from makinacorpus/service
...
ubuntu systemd/legacy init support
2015-05-29 17:02:08 -06:00
Thomas S Hatch
b07e60621b
Merge pull request #24007 from garethgreenaway/beacon_state_module
...
Adding a state module to manage beacons
2015-05-29 17:00:22 -06:00
Thomas S Hatch
41ada361ce
Merge pull request #24103 from makinacorpus/profiling
...
Profiling
2015-05-29 16:59:49 -06:00
Thomas S Hatch
48ba667337
Merge pull request #24223 from twangboy/win_wua_module
...
Added module win_wua.py for managing windows updates
2015-05-29 16:58:37 -06:00
Thomas S Hatch
fd91e22f7b
Merge pull request #24249 from cedwards/pillar_item_patch
...
patch pillar.item to support nested pillar
2015-05-29 16:58:12 -06:00
Thomas S Hatch
195167ef83
Merge pull request #23837 from cedwards/ats_state
...
Initial Traffic Server state module
2015-05-29 16:57:27 -06:00
Colton Myers
08a10755b3
Merge pull request #24260 from basepi/lxctypos24080
...
Fix some typos from #24080
2015-05-29 16:54:58 -06:00
Colton Myers
0fa1ad3977
Fix another lxc typo
2015-05-29 16:54:06 -06:00
Colton Myers
669938f28d
s/you ll/you'll/
2015-05-29 16:53:37 -06:00
Colton Myers
75590cf490
Merge pull request #24080 from makinacorpus/lxc_consistency2
...
Lxc consistency2
2015-05-29 16:51:54 -06:00
Colton Myers
bf2eddc839
Merge pull request #24224 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-29 16:26:53 -06:00
Jerzy Drozdz
e564a0b473
Added setting of __grains__['osrelease'] in test
2015-05-30 00:16:25 +02:00
Justin Findlay
9508924c02
fix pkg mod integration test on ubuntu 12.04
2015-05-29 15:52:57 -06:00
Justin Findlay
da14f3b976
Merge pull request #24247 from rallytime/bp-24220
...
Backport #24220 to 2015.5
2015-05-29 15:40:01 -06:00
Justin Findlay
21d6126c34
Merge pull request #24254 from rallytime/add_deprecation_warning_digitalocean
...
Add deprecation warning to Digital Ocean v1 Driver
2015-05-29 15:39:25 -06:00
Justin Findlay
dac055dd8b
Merge pull request #24252 from aboe76/opensuse_package
...
Updated suse spec to 2015.5.1
2015-05-29 15:38:45 -06:00
Justin Findlay
49e7fe8a5e
Merge pull request #24251 from garethgreenaway/2015_5_returner_brokenness
...
Returners broken in 2015.5
2015-05-29 15:37:51 -06:00
Joseph Hall
bfb946123e
Merge pull request #24255 from rallytime/clarify_digital_ocean_driver_docs
...
Clarify digital ocean documentation and mention v1 driver deprecation
2015-05-29 15:37:07 -06:00
Justin Findlay
41f5756f36
Merge pull request #24232 from rallytime/bp-23308
...
Backport #23308 to 2015.5
2015-05-29 15:36:46 -06:00
Colton Myers
90cb448910
Fix rest of rabbitmq tests
2015-05-29 15:11:25 -06:00
Colton Myers
7736509c6b
Fix rabbitmq test
2015-05-29 15:11:19 -06:00
Colton Myers
22837e4489
Add six back in and use it for new code
2015-05-29 15:11:11 -06:00
Colton Myers
6b1c1c6faf
Remove unused import
2015-05-29 15:11:04 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
