Nicole Thomas
2f5fdd5da6
Merge pull request #20520 from jfindlay/add_upgrade
...
add support for upgrade in apt list upgrades
2015-02-09 11:00:04 -07:00
Justin Findlay
09b36a6b72
add support for upgrade in apt list upgrades
2015-02-09 10:24:00 -07:00
Thomas S Hatch
97f91e5817
Merge pull request #20457 from cachedout/more_socket_iter
...
Iterate over the socket copy
2015-02-09 10:12:35 -07:00
Thomas S Hatch
75e3751c27
Merge pull request #20287 from garethgreenaway/20033_specify_gpghome
...
Changes to gpg.py module
2015-02-09 10:08:27 -07:00
jfindlay
e0ceb40d94
Merge pull request #20513 from GregMSThompson/add_to_source_ip_tables
...
Added the option to-source to the after_jump list, to enable the config...
2015-02-09 08:29:20 -07:00
jfindlay
fea95c0866
Merge pull request #20517 from rupeshta/nagios_unit_tests
...
implemented unit test cases for nagios module
2015-02-09 08:28:24 -07:00
jfindlay
23494674a8
Merge pull request #20516 from jayeshka/haproxyconn-unit-test
...
adding haproxyconn unit test case
2015-02-09 08:26:47 -07:00
jfindlay
e1eabff9cd
Merge pull request #20515 from jayeshka/osxdesktop-unit-test
...
adding osxdesktop unit test case
2015-02-09 08:23:30 -07:00
Rupesh Tare
264b63b9df
implemented unit test cases for nagios module
2015-02-09 19:49:14 +05:30
Jayesh Kariya
d6101705b9
adding osxdesktop unit test case
2015-02-09 18:24:45 +05:30
Jayesh Kariya
d72afef3dd
adding haproxyconn unit test case
2015-02-09 18:23:22 +05:30
Greg Thompson
41039e0e03
Added the option to-source to the after_jump list, to enable the
...
configuration of SNAT rules with the iptables module.
2015-02-09 12:12:46 +00:00
Joseph Hall
dc73c308fc
Merge pull request #20501 from gtmanfred/develop
...
include rackconnectv3 variable
2015-02-07 20:01:21 -07:00
Daniel Wallace
a123e93760
add note about rackconnectv3 variable
2015-02-07 20:37:59 -06:00
Daniel Wallace
9448494ce1
fix rackconnect v3 implementation
2015-02-07 20:35:33 -06:00
jfindlay
b8deab5af9
Merge pull request #20497 from highlyunavailable/feature/influxdb_fixes
...
Fix influx API name warnings and user delete bug
2015-02-07 16:49:32 -07:00
jfindlay
3d64e24e53
Merge pull request #20491 from bechtoldt/requisites_article
...
add some cosmetic changes to the state requisites article
2015-02-07 16:37:39 -07:00
Highly Unavailable
cda2b65bf5
Fix more errors.
...
That'll teach me not to work in two places at once.
2015-02-07 14:52:08 -08:00
Highly Unavailable
8bea0241b8
Fix incorrect variable name
2015-02-07 14:33:59 -08:00
Highly Unavailable
826f32804c
Fix lint errors and make check more specific
2015-02-07 14:32:52 -08:00
Highly Unavailable
df7c09e616
Fix influx API name warnings and user delete bug
...
Some influxdb python API methods changed names and were generating
warnings every time this module was run.
The user_remove method had a bug that actually deleted the user you were
logged in as rather than the user you wanted to delete when run.
Added a method to test login for a user to see if they exist (mostly to
work around a use case described in #20496.) - for example to try logging
in as root:root to see if it's been deleted.
2015-02-07 13:15:39 -08:00
Arnold Bechtoldt
88dea95c6c
add some cosmetic changes to the state requisites article
2015-02-07 18:46:03 +01:00
jfindlay
654de6bc60
Merge pull request #20486 from l2ol33rt/fix_mint_17
...
Allow Linux Mint to use upstart
2015-02-06 20:51:52 -07:00
Seth House
60b960c33e
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-02-06 19:53:04 -07:00
Seth House
9a1a2db3aa
Merge remote-tracking branch 'upstream/2014.7' into 2015.2
2015-02-06 19:52:23 -07:00
Pedro Algarvio
5586c2064b
Merge pull request #20487 from whiteinge/doc-remove-mako-mock
...
Remove Mako from mocked deps for docs build
2015-02-07 02:28:53 +00:00
Seth House
bf6dfe823e
Remove Mako from mocked deps for docs build
...
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.
Closes #9571 (at long last).
2015-02-06 19:00:35 -07:00
jfindlay
4afaccf6b1
Merge pull request #20482 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-02-06 16:59:27 -07:00
Robert James Hernandez
fbf2241348
Allow mint to use upstart
2015-02-06 15:57:01 -08:00
jfindlay
f57c15f672
Merge pull request #20480 from basepi/saltssh.errors.20223
...
[2014.7] Fix bugs in salt-ssh cleanup code from #20229
2015-02-06 16:10:46 -07:00
Colton Myers
75cf0a601e
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-02-06 15:43:59 -07:00
Colton Myers
7fc92c8dce
Merge pull request #20483 from basepi/fixcronmergeforward
...
Fix an error caused by a bad merge forward
2015-02-06 15:43:27 -07:00
Colton Myers
307212c0e0
Fix an error caused by a bad merge forward
2015-02-06 15:42:55 -07:00
Colton Myers
244c916b10
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cron.py
salt/states/npm.py
2015-02-06 15:41:21 -07:00
jfindlay
c75ec867ff
Merge pull request #20477 from rallytime/pylint
...
Pylint fix for develop
2015-02-06 15:39:53 -07:00
Colton Myers
024938341e
Fix pylint
2015-02-06 15:25:15 -07:00
Colton Myers
1370fddfef
Yield ret immediately
2015-02-06 15:03:54 -07:00
Colton Myers
48c029efdb
Fix race condition in salt-ssh cleanup
...
Conflicts:
salt/client/ssh/__init__.py
2015-02-06 15:03:39 -07:00
jfindlay
3872ffb9ef
Merge pull request #20479 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-02-06 14:04:03 -07:00
jfindlay
6d689d1eea
Merge pull request #20470 from jacksontj/loader
...
Fix botched py3 compat change
2015-02-06 13:48:17 -07:00
Colton Myers
6e7df06e05
Remove code as instructed by @jfindlay
2015-02-06 13:13:30 -07:00
Colton Myers
af21033482
Merge pull request #20478 from basepi/merge-forward-develop2
...
Merge forward from 2015.2 to develop
2015-02-06 13:11:14 -07:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
rallytime
dd413f495d
Move integration import after ensure_in_syspath call
2015-02-06 12:49:28 -07:00
Colton Myers
bba019371a
Merge pull request #3 from jfindlay/locale_test_fix
...
fix merge forward localemod tests
2015-02-06 12:23:35 -07:00
Justin Findlay
b59a164717
fix merge forward localemod tests
2015-02-06 12:21:13 -07:00
Colton Myers
06e1a4f519
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop2
...
Conflicts:
salt/client/mixins.py
salt/loader.py
salt/modules/localemod.py
salt/modules/pillar.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/__init__.py
salt/states/mount.py
salt/states/ssh_auth.py
2015-02-06 12:09:01 -07:00
Joseph Hall
fc9f379e29
Merge pull request #20474 from djcrabhat/vsphere-sudo-deploy
...
add sudo, sudo_password params to vsphere deploy to allow for non-root deploys
2015-02-06 11:19:48 -07:00
Mike Place
54d92f86df
Use list instead
2015-02-06 10:55:01 -07:00
Manoli Yiannakakis
bb916935f1
add sudo, sudo_password params to deploy to allow for non-root deploys
2015-02-06 09:37:47 -08:00
