Rupesh Tare
2493ccc09e
implemented unit test cases for http module
2015-01-22 16:13:18 +05:30
Nicole Thomas
b61817daf0
Merge pull request #19943 from rallytime/pylint_develop
...
Fix another pylint error
2015-01-22 00:31:45 -07:00
rallytime
5af605b3fd
Fix another pylint error
2015-01-22 00:30:27 -07:00
Nicole Thomas
e047464e31
Merge pull request #19941 from rallytime/pylint_develop
...
Pylint fix for develop
2015-01-22 00:09:50 -07:00
rallytime
f191a3c169
Pylint fix for develop
2015-01-21 23:56:26 -07:00
Samuel Smith
332beeaee8
Merge pull request #19931 from SmithSamuelM/sam_20150121
...
More preparatory work on master cluster
2015-01-21 17:07:31 -07:00
Samuel M Smith
ca02c6c1ad
more prep work for master cluster
2015-01-21 17:05:55 -07:00
Samuel M Smith
6792509997
more prep work for master cluster
2015-01-21 16:31:38 -07:00
Samuel Smith
4424d64a2e
Merge pull request #19929 from SmithSamuelM/sam_20150121
...
Predatory work on the master cluster
2015-01-21 16:18:44 -07:00
Samuel M Smith
30365c1802
Prepatory work on the master cluster
2015-01-21 16:16:51 -07:00
Samuel M Smith
25d2ab7572
removed obsolete method
2015-01-21 15:39:32 -07:00
Samuel M Smith
87c9a0e3bf
Added new opts for master cluster
...
'cluster_mode' True or False
'cluster_masters' List of host addresses of master(s) in cluster to bootstrap onto
Same for both minion and master
Added a couple of behaviors to setup salt.road.manor.cluster.masters
refactor how joiner is setup
2015-01-21 15:35:04 -07:00
Samuel Smith
e162ce8aca
Merge pull request #19925 from SmithSamuelM/sam_20150120
...
Changed the now deprecated .postinitio to ._prepare
2015-01-21 14:34:02 -07:00
Samuel M Smith
1a9ff9928a
Changed the now deprecated .postinitio to ._prepare
2015-01-21 14:31:39 -07:00
Thomas S Hatch
fa1903ef7d
Merge pull request #19915 from cachedout/fix_perf
...
Fix some performance regressions
2015-01-21 13:18:15 -07:00
Thomas S Hatch
8f8ff4e7ed
Merge pull request #19918 from jfindlay/fix_ddns_tests
...
fix ddns tests
2015-01-21 13:16:49 -07:00
Justin Findlay
d4547bc025
fix skipIf typo
2015-01-21 12:37:51 -07:00
Thomas S Hatch
28a6a78b02
Merge pull request #19895 from syedaali/develop
...
add tuned execution and state module
2015-01-21 12:21:45 -07:00
Thomas S Hatch
0eff1e46d6
Merge pull request #19867 from rupeshta/grub_legacy_unit_tests
...
implemented unit test cases for module grub_legacy
2015-01-21 12:20:51 -07:00
Justin Findlay
5f3f2f3bae
fix ddns tests
...
These tests will only work if dnspython is installed. Mocking away
dnspython is a great amount of work, so we'll just disable these tests
for now.
2015-01-21 12:17:09 -07:00
Colton Myers
9446633e9d
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-01-21 12:05:51 -07:00
Thomas S Hatch
b6faad4bdc
Merge pull request #19913 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-21 12:03:08 -07:00
Thomas S Hatch
7ed5186a4e
Merge pull request #19910 from s0undt3ch/hotfix/create-parent-dirs-2015.2
...
[2015.2] create parent dirs
2015-01-21 11:56:00 -07:00
Mike Place
9bfe83b7b0
Fix some performance regressions
...
Move YAML load down into function and keep it out of module space
The get_event() call incurs a 1s penelty on all LocalClient
initalizations. Removed.
2015-01-21 11:48:14 -07:00
Colton Myers
098c39596a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/templates/rh_ip/rh5_eth.jinja
salt/templates/rh_ip/rh6_eth.jinja
salt/utils/templates.py
2015-01-21 11:19:06 -07:00
Thomas S Hatch
83591dff8f
Merge pull request #19909 from s0undt3ch/hotfix/create-parent-dirs
...
Create parent directories
2015-01-21 10:57:58 -07:00
Thomas S Hatch
938af03520
Merge pull request #19902 from jfindlay/fix_blkid
...
test for blkid before running disk.blkid
2015-01-21 10:57:37 -07:00
Thomas S Hatch
f365e89207
Merge pull request #19900 from jayeshka/git-unit-test
...
adding git unit test case
2015-01-21 10:57:26 -07:00
Thomas S Hatch
067577288f
Merge pull request #19906 from techhat/verifyssl
...
Allow SSL verification to be turned off
2015-01-21 10:41:55 -07:00
Thomas S Hatch
678c57f414
Merge pull request #19907 from techhat/httpdocs
...
Update HTTP tutorial for new functionality
2015-01-21 10:41:34 -07:00
Thomas S Hatch
96245cf2b2
Merge pull request #19893 from thatch45/mhead_clean
...
Clean up an import mistake
2015-01-21 10:22:02 -07:00
Thomas S Hatch
48465a6193
Merge branch 'develop' into mhead_clean
...
Conflicts:
salt/daemons/flo/zero.py
2015-01-21 10:19:59 -07:00
Pedro Algarvio
1183eb1a93
Make sure parent directories are also created
2015-01-21 17:19:48 +00:00
Pedro Algarvio
82b2b723a1
Create parent directories
2015-01-21 17:19:19 +00:00
Joseph Hall
dcf6304f0d
Use syspaths
2015-01-21 10:17:57 -07:00
Pedro Algarvio
b837c3bc81
Create parent directories
2015-01-21 17:17:14 +00:00
Nicole Thomas
18fc519270
Merge pull request #19905 from techhat/joyent-2015.2
...
Modify how joyent driver handles SSL and URLs
2015-01-21 09:41:35 -07:00
Nicole Thomas
d244624a1f
Merge pull request #19903 from saltstack/revert-19687-joyent
...
Revert "Allow joyent api host suffix to be configurable"
2015-01-21 09:39:57 -07:00
Joseph Hall
483e84c78a
Update HTTP tutorial for new functionality
2015-01-21 09:20:11 -07:00
Joseph Hall
b8a531a955
Allow SSL verification to be turned off
2015-01-21 08:55:11 -07:00
Joseph Hall
667473c72c
Modify how joyent driver handles SSL and URLs
2015-01-21 08:29:06 -07:00
Nicole Thomas
ab725d5c7a
Merge pull request #19904 from rallytime/pylint_dot_seven
...
Fix pylint errors on 2014.7
2015-01-21 08:24:29 -07:00
rallytime
4a6f78821f
Fix pylint errors on 2014.7
2015-01-21 08:23:45 -07:00
Nicole Thomas
8989c48aa1
Merge pull request #19894 from s0undt3ch/develop
...
Lint fixes
2015-01-21 08:12:26 -07:00
Joseph Hall
27adbbe8aa
Revert "Allow joyent api host suffix to be configurable"
2015-01-21 08:05:45 -07:00
Justin Findlay
192ccc7373
test for blkid before running disk.blkid
2015-01-21 07:45:17 -07:00
Pedro Algarvio
8dbb7394b2
White-space lint fix
2015-01-21 14:17:03 +00:00
Pedro Algarvio
e41f0527ab
Lint fix. Multiple exceptions should be enclosed in parens
2015-01-21 14:15:14 +00:00
Pedro Algarvio
3e7903e1f1
Py3 compatibility
2015-01-21 14:14:00 +00:00
Pedro Algarvio
01de65c702
Strip trailing white-space
2015-01-21 14:11:50 +00:00
