Thomas S Hatch
d60804a709
lint fixes for #15695
2014-09-12 10:42:35 -06:00
Thomas S Hatch
5d27e77c92
Merge branch 'feature/postgres_schema' of https://github.com/novapost/salt into novapost-feature/postgres_schema
2014-09-12 10:39:40 -06:00
Thomas S Hatch
d6e3e01c6d
Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules
...
F/add syslog ng modules
2014-09-12 10:37:02 -06:00
Rodolphe Quiédeville
b4dcc992c5
- salt/modules/postgres.py: add functions to manipulate schemas
...
- salt/states/postgres_schema.py: new states for schemas
- tests/unit/modules/postgres_test.py: add tests on new functions
- tests/unit/states/postgres_test.py: add tests on new functions
2014-09-11 12:17:18 +02:00
rallytime
f7a00ce643
Fix mdadm tests
2014-09-09 07:07:23 -06:00
Dave Rawks
873ca1e0b1
Updated test to account for additional flag
2014-09-05 10:08:17 -07:00
Thomas S Hatch
e34e81f41b
Merge branch '2014.7' into develop
...
Conflicts:
salt/minion.py
2014-09-05 11:03:12 -06:00
Thomas S Hatch
70950a1543
Merge pull request #15510 from lyft/boto_elb_resolve_error_on_deregister_instances_call
...
deregister_instances and register_instances methods return True/False/None
2014-09-04 15:32:45 -06:00
Colin Johnson
754c01448e
provide True, False and None returns on deregister_instances and register_instances methods
2014-09-04 05:53:52 +00:00
Colton Myers
c127b4bafe
Bring boto module tests from develop to 2014.7
2014-09-03 15:22:17 -06:00
Cimarron Mittelsteadt
8326182e5e
TST: Updated brew module unit test to patch the appropriate __salt__ functions for the updates to brew module
2014-09-02 11:12:01 -07:00
btibi
69b0deacf6
syslog_ng: add syslog-ng state and execution modules
2014-08-29 23:20:25 +02:00
Gavin Swanson
d972aeff55
Merge branch 'addCygwin' into develop
2014-08-23 15:56:32 -07:00
rallytime
2285a10a95
Use salt.utils.odict instead of python2.7 OrderedDict
2014-08-20 09:24:52 -06:00
Nicole Thomas
37420dfed3
Merge pull request #15012 from lyft/boto_vpc-boto_secgroup-resolve-unit-test-failures
...
Boto vpc boto secgroup resolve unit test failures
2014-08-19 13:05:14 -06:00
Colin Johnson
9e797d6664
skip if mock not found
2014-08-19 16:19:41 +00:00
Colin Johnson
72b9ebe304
move to LooseVersion for Boto version testing
2014-08-15 23:05:05 +00:00
Colin Johnson
c3a6f3d727
fix boto versions for boto_secgroup and boto_vpc
2014-08-15 22:57:44 +00:00
Colton Myers
932aa97e1f
Merge branch '2014.7' into develop
2014-08-15 16:33:02 -06:00
Gavin Swanson
c8d19409f6
Add cygwin package installation
...
Currently only hadles adding packages. Does not remove packages. It is
setup to update packages any time it is run, but there is no independent
update functionality.
Curently no unit/integration testing is done. I haven't wrapped my head
around the way the mocking and stuff is done yet.
2014-08-15 14:13:22 -07:00
Colin Johnson
86bcea16ee
resolve issue with boto < 2.4.0 GroupOrCIDR attributes
2014-08-15 18:58:26 +00:00
rallytime
e8fab3d28a
Fix psutil version
2014-08-14 21:22:55 -06:00
rallytime
0683c704dd
Move psutil version check
2014-08-14 21:20:25 -06:00
Colin Johnson
41c51b4044
resolve issue with Ubuntu 12.0.4 failures
2014-08-15 01:12:43 +00:00
rallytime
8dca2515ee
Skip virtual_memory and swap_memory tests if psutil < 0.6.0
2014-08-14 16:16:38 -06:00
rallytime
f9e481e49d
Add needs_daemon=False to run_tests
2014-08-12 16:57:34 -06:00
rallytime
d57fc99bca
Move mock_ec2 decorator back to functions
2014-08-12 09:20:17 -06:00
rallytime
5fff2f9b3f
Rename boto tests files to include '_test' at the end
2014-08-11 17:01:42 -06:00
Nicole Thomas
64ee26aa57
Merge pull request #14897 from rallytime/boto_test_fixes
...
Update imports and skipIfs on boto unit tests
2014-08-11 17:01:01 -06:00
Seth House
b5bf67fdd1
Merge branch 'copyediting' of https://github.com/hulu/salt into develop
...
Conflicts:
salt/states/win_update.py
2014-08-11 18:23:44 -04:00
Pedro Algarvio
09acfae48e
Bring the global variables more into their context
2014-08-11 22:25:21 +01:00
rallytime
cc5c3bc1ad
Update imports and skipIfs on boto unit tests
2014-08-11 12:57:45 -06:00
Chris Rebert
7da0f0a8b6
fix "retreived" typos
2014-08-11 11:52:30 -07:00
Chris Rebert
177c168a21
Fix numerous typos found via Lintian
...
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Thomas S Hatch
b166b0c7c1
Merge branch '2014.7' into develop
2014-08-08 15:48:01 -06:00
Pedro Algarvio
c9be462f00
Skip tests if real mock library is not available
2014-08-08 00:52:47 +01:00
Pedro Algarvio
a399e62ca2
Skip tests if real mock library is not available
2014-08-08 00:46:21 +01:00
Pedro Algarvio
97f1b00818
Skip tests if real mock library is not available
2014-08-08 00:46:21 +01:00
Pedro Algarvio
faf3157637
Skip tests if real mock library is not available
2014-08-08 00:46:21 +01:00
Thomas S Hatch
d6e3e31a22
lint fixes
2014-08-05 12:08:05 -06:00
Colin Johnson
d26b671b00
add vpc support in boto_secgroup execution module
2014-08-05 03:45:00 +00:00
Colin Johnson
8dd88066f7
boto_asg now support use of security group names in launch configs
2014-08-04 00:04:20 +00:00
Seth House
d7d8beabb8
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-07-25 19:55:43 -06:00
Seth House
adabf74852
Added utils module for working with hash functions
2014-07-25 16:12:37 -06:00
Seth House
ac6c7d0d6d
Added utils-style IP-check functions to the network module
2014-07-25 15:20:14 -06:00
Rob Messick
74cf92331b
add optional pre_releases argument to gem.install
2014-07-24 17:26:27 -07:00
Colin Johnson
c8e8bf1577
LYFT-14491 - unit tests for rule modification
2014-07-23 22:59:38 +00:00
rallytime
a3da60def4
Remove unnecessary print statement
2014-07-22 12:16:39 -06:00
rallytime
81e06fa252
Removed deprecated functions in salt/modules/ps.py
2014-07-16 12:49:45 -06:00
rallytime
1c3737a883
Remove remaining references and tests to no_site_packages
2014-07-16 06:00:08 -06:00