Commit Graph

27159 Commits

Author SHA1 Message Date
Thomas S Hatch
976bac1b97 Merge pull request #10913 from cvrebert/patch-1
rm trailing whitespace from salt/states/file.py
2014-03-03 14:09:31 -08:00
Chris Rebert
65deed0365 rm trailing whitespace from salt/states/file.py
************* Module salt.states.file
salt/states/file.py:954: [C0303(trailing-whitespace), ] Trailing whitespace
2014-03-03 14:08:16 -08:00
Samuel M Smith
43dcaa08a1 deleted raet.py now obsolete 2014-03-03 14:49:08 -07:00
Samuel M Smith
c24b74223d updated master minion to use the latest ioflo.app.run.start
put salt specific raet behaviors for testing in salting.py
2014-03-03 14:47:36 -07:00
Thomas S Hatch
6d23350d85 Merge pull request #10910 from rallytime/brew_test
A couple more brew tests
2014-03-03 13:44:55 -08:00
Thomas S Hatch
f2762fe1c5 Merge pull request #10909 from joshk0/known_hosts_file_2
Check that known_hosts file is a real file before inserting into SSH con...
2014-03-03 13:44:27 -08:00
Thomas S Hatch
17d9161a15 Merge pull request #10908 from basepi/proxylog
Clarify proxy log (not a problem in 99% of cases)
2014-03-03 13:43:53 -08:00
Thomas S Hatch
a017c4d8c3 Merge pull request #10907 from mgwilliams/lxc1.0
add support for lxc 1.0 (deprecating < 1.0)
2014-03-03 13:43:11 -08:00
Darrel Clute
6cdd1187c4 added versionchanged 2014-03-03 14:42:55 -07:00
Daniel Wallace
742ecfa53b add to setup.py 2014-03-03 15:04:52 -06:00
Darrel Clute
93daf22a7e Merge remote-tracking branch 'upstream/develop' into shadow-module-updates 2014-03-03 13:55:20 -07:00
rallytime
25c77b2559 A couple more brew tests 2014-03-03 13:51:42 -07:00
Joshua Kwan
a858f2d584 Check that known_hosts file is a real file before inserting into SSH config 2014-03-03 15:46:18 -05:00
Colton Myers
b5da175628 Clarify proxy log (not a problem in 99% of cases) 2014-03-03 13:40:20 -07:00
Darrel Clute
d7ffcd1988 Add account expire support through chage 2014-03-03 13:35:11 -07:00
Darrel Clute
7aaa2b6ae6 Fix docstring on set_date 2014-03-03 13:30:17 -07:00
Thomas S Hatch
fa593c9284 Initial alpha of the UXDRouter on the master 2014-03-03 13:23:55 -07:00
Samuel M Smith
9467f9dc18 fixed indexes so that they use 127.0.0.1 instead of 0.0.0.0 when boostrapping joining a Road with sd or dd == 0 2014-03-03 13:16:33 -07:00
Samuel Smith
909286ed0e Merge pull request #10904 from SmithSamuelM/sam_raet_14
Sam raet 14  Fixed naming a couple of places also tested with new ioflo
2014-03-03 12:50:47 -07:00
Samuel M Smith
efdce44252 Merge remote-tracking branch 'upstream/develop' into sam_raet_14 2014-03-03 12:47:49 -07:00
Samuel M Smith
b9249734b0 Fixed default dirpath 2014-03-03 12:47:10 -07:00
Daniel Wallace
97d2a82c29 hook nova module to salt/utils/openstack/nova.py 2014-03-03 13:41:50 -06:00
Thomas S Hatch
c1cb399493 some more linting 2014-03-03 12:13:23 -07:00
Thomas S Hatch
2c45e0c477 Whitespace cleanup 2014-03-03 12:10:55 -07:00
Thomas S Hatch
ddc296ba26 Merge pull request #10873 from bemehow/top_sls_ordering
make sure top.sls is evaluated in order
2014-03-03 11:09:21 -08:00
Thomas S Hatch
4324c8b6a0 Fix Lint errors 2014-03-03 12:05:00 -07:00
Thomas S Hatch
7589f4bb26 Merge pull request #10897 from makinacorpus/return
salt.runner.jobs: optionnal toggle for output
2014-03-03 11:03:10 -08:00
Thomas S Hatch
4dfdce7711 Merge pull request #10893 from bemehow/s3_url
add support for s3:// URI in file.managed state
2014-03-03 11:02:07 -08:00
Thomas S Hatch
24e2a01cae Merge pull request #10880 from jacksontj/argkwarg
Clean up deprecation warnings about arg/kwarg passing
2014-03-03 10:43:23 -08:00
Thomas S Hatch
88c13ccee6 Merge pull request #10879 from tweakster/develop
Update __init__.py
2014-03-03 10:41:11 -08:00
Thomas S Hatch
0ceb9f3958 Merge pull request #10866 from joshk0/known_hosts_file
Allow 'known_hosts_file' as SSH client option
2014-03-03 10:36:52 -08:00
Thomas S Hatch
922757a38c Merge pull request #10864 from JensRantil/custom-pillar-git-root
Custom pillar git root
2014-03-03 10:36:01 -08:00
Thomas S Hatch
e32cf6e74f Merge pull request #10861 from georgemarshall/utils_fix
Fix utils.option to recurse dict keys
2014-03-03 10:34:28 -08:00
Thomas S Hatch
bc636a38c8 Merge pull request #10860 from dr4Ke/state_mysql_query
State mysql query
2014-03-03 10:32:58 -08:00
Samuel M Smith
79ecd9caa6 minor refactor keep together 2014-03-03 11:22:02 -07:00
Samuel M Smith
0ad9a127f3 Merge remote-tracking branch 'upstream/develop' into sam_raet_14 2014-03-03 11:19:06 -07:00
Samuel M Smith
fdf28e9e48 added forking.py 2014-03-03 11:18:24 -07:00
Samuel M Smith
1cba8418f8 Changed name lookup logic 2014-03-03 11:17:05 -07:00
Joseph Hall
2d2c44fe6e Merge pull request #10902 from timoguin/develop
Add versionadded directive to MS Azure cloud docs on develop branch
2014-03-03 11:13:13 -07:00
Tim O'Guin
734ac983b3 added versionadded directive to MS Azure cloud docs 2014-03-03 12:03:40 -06:00
Daniel Wallace
ccb6e6d52e Move nova.py module to salt/utils/openstack/ 2014-03-03 11:27:01 -06:00
Michal Bicz
d9331dbaae pylint cleanup 2014-03-03 09:09:27 -08:00
Mathieu Le Marec - Pasquet
b734b19d20 salt.runner.jobs: optionnal toggle for output
Very useful to switch output=off for API calls
2014-03-03 11:42:14 +00:00
Pedro Algarvio
b5223336df Merge pull request #10895 from bbinet/fix-influxdb-v0.5.0
fix influxdb user_list method
2014-03-03 11:40:21 +00:00
Matthew Williams
9803425375 add support for lxc 1.0 (deprecating < 1.0) 2014-03-03 06:40:02 -05:00
Bruno Binet
3bc48c00a7 add influxdb compatibility version to influxdb salt states 2014-03-03 12:04:06 +01:00
Bruno Binet
9f3087f040 add influxdb compatibility version to influxdb salt module 2014-03-03 12:03:44 +01:00
Bruno Binet
0241e26c8f fix influxdb user_list method
api has changed in influxdb v0.5.0
2014-03-03 09:13:38 +01:00
Joseph Hall
a6d4207f13 Merge pull request #10892 from viodlen/develop
Doc improvement
2014-03-02 18:55:52 -07:00
Joseph Hall
28db5200af Merge pull request #10889 from Katafalkas/salt-cloud_ec2_snapshot_functions
Salt cloud ec2 snapshot functions
2014-03-02 18:23:59 -07:00