valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
43,156 Commits 24 Branches 182 Tags 341 MiB
3d73816507
Commit Graph

3357 Commits

Author SHA1 Message Date
Thomas S Hatch
3d73816507 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/network.py
	salt/utils/parsers.py
 2014-12-09 10:59:18 -07:00
rallytime
db9ae406c3 Fix mocked calls in unit/modules/archive_test.py 
This is due to the changes in #18621
 2014-12-09 08:36:30 -07:00
Justin Findlay
b7467f5f45 update venv unit tests accordingly 2014-12-08 23:28:28 -07:00
Pedro Algarvio
e4f39ed32f Fix variable ref 2014-12-08 18:07:04 +00:00
Pedro Algarvio
9bf2f77b2e Make coverage reports optional 2014-12-08 17:32:28 +00:00
Thomas S Hatch
59f16926e9 Revert "Channel/Sreq cleanup" 2014-12-04 13:26:04 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Thomas S Hatch
f17b456e7d Merge pull request #18663 from terminalmage/buildpackage-jenkins-adjustment 
Always run download_packages() after executing buildpackage SLS
 2014-12-03 21:06:54 -07:00
Thomas S Hatch
b1b770014b Merge pull request #18592 from nazgul5/utils.network 
salt.utils.network._interfaces_ifconfig: SunOS fix
 2014-12-03 10:02:15 -07:00
Thomas Jackson
59b177097b Remove tests for old interface 2014-12-02 22:51:47 -08:00
Pedro Algarvio
60b9d47be5 Merge pull request #18638 from s0undt3ch/2014.7 
Some 2014.7 test fixes
 2014-12-03 00:54:43 +00:00
Erik Johnson
5c864fa003 Always run download_packages() after executing buildpackage SLS 
By restricting this function call to when the script is successful, we
end up losing the log file from buildpackage.py when it fails, making it next to
impossible to troubleshoot. This commit makes jenkins retrieve at least
the log file, no matter what happens.
 2014-12-02 17:49:50 -06:00
Pedro Algarvio
a964a2161e Switch imports and revert the assert to what it was. 2014-12-02 23:18:54 +00:00
Pedro Algarvio
04fe9382aa Merge pull request #18585 from rallytime/cmd_unittests 
Added some more cmdmod unittests
 2014-12-02 15:54:57 +00:00
Pedro Algarvio
6a259dc229 Proper minion config initialization. Fix test. 2014-12-02 07:55:52 +00:00
Pedro Algarvio
c6eab06e70 Add required imports 2014-12-02 07:44:16 +00:00
Pedro Algarvio
f720fc1f78 Proper minion config initialization 2014-12-02 07:43:18 +00:00
Pedro Algarvio
0dd818053e Proper minion config setup 2014-12-02 07:34:45 +00:00
Pedro Algarvio
55b68c389d Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:40:47 +00:00
Pedro Algarvio
83153354c4 Remove PyLint disable rule in 2014.7 
Since it's unlikely we upgrade PyLint in this branch
 2014-12-02 01:37:42 +00:00
Pedro Algarvio
2396568dd5 Remove unused import 2014-12-02 01:36:49 +00:00
Pedro Algarvio
b37c76a800 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:09:15 +00:00
Pedro Algarvio
6530a7911e Disable the false import error 2014-12-02 01:06:56 +00:00
Pedro Algarvio
4372415db8 Merge branch 'merge-forward' of https://github.com/basepi/salt into develop 
Conflicts:
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 00:30:31 +00:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00
Colton Myers
fcc2196a5f Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runner.py
	salt/runners/lxc.py
	salt/runners/manage.py
	salt/utils/schedule.py
	tests/unit/modules/boto_vpc_test.py
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-12-01 15:04:03 -07:00
rallytime
3760915099 Skip test_max_open_files test until we can find the real problem 2014-12-01 13:43:57 -07:00
Vitalii Nazg
8f9af6802b Lint fixes: unused import, tabs 2014-12-01 22:08:23 +02:00
rallytime
a26cd377ff More cmdmod unittests 2014-12-01 08:57:11 -07:00
rallytime
c3d90c9f4f If umask=0 is provided, enter the umask if statement 
Previously the 'Zero umask is not allowed' statement was not getting hit
Also updated the appropriate umask tests
 2014-12-01 08:57:10 -07:00
rallytime
98b06be08a Added some more cmdmod unittests 2014-12-01 08:57:10 -07:00
rallytime
e7cdd75090 Add another cmdmod.py unittest 2014-12-01 08:57:10 -07:00
Pedro Algarvio
be18e8b244 Disable some Pylint errors 2014-12-01 03:24:41 +00:00
Pedro Algarvio
bdf3a3e91c Disable some Pylint errors 2014-12-01 03:24:37 +00:00
Pedro Algarvio
fd9377fefe Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
a985f0ac4e Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Vitalii Nazg
8ff9e7f7e9 salt.utils.network._interfaces_ifconfig: SunOS fix 
In SunOS 11.1 with IPv6 enabled interfaces occur twice in 'ifconfig -a'
output with the same name: for ipv4 and then for ipv6 addr family. Thus,
ipv6 data overwrites data collected from ipv4 interfaces.

Every instance has it's own 'UP' status and we assume that ipv4
status determines global interface status.

Thus commit tries to merge data from conflicting instances.

Also, regexp was tuned for SunOS's ifconfig.
 2014-11-28 19:02:45 +02:00
Pedro Algarvio
9d6c855e1a Disable some Pylint errors 2014-11-28 15:33:45 +00:00
Pedro Algarvio
b07707ff96 Disable some Pylint errors 2014-11-28 15:31:55 +00:00
Pedro Algarvio
8a1cc589a1 Disable some Pylint errors 2014-11-28 15:31:01 +00:00
Pedro Algarvio
14cc8931ed Disable some Pylint errors 2014-11-28 15:30:05 +00:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-11-27 03:59:40 +00:00
Pedro Algarvio
78bc5107ee Switch open() for salt.utils.fopen() 2014-11-26 23:38:34 +00:00
Pedro Algarvio
62ec46d6dd Switch open() for salt.utils.fopen() 2014-11-26 23:37:01 +00:00
Pedro Algarvio
d957d2e911 Switch open() for salt.utils.fopen() 2014-11-26 23:36:26 +00:00
Pedro Algarvio
bea345e720 Switch open() for salt.utils.fopen() 2014-11-26 23:35:31 +00:00
Pedro Algarvio
1857a0d31f Switch open() for salt.utils.fopen() 2014-11-26 23:30:18 +00:00
Pedro Algarvio
8735242906 We need to call read()! 2014-11-26 23:13:19 +00:00
Pedro Algarvio
b8b4158377 Remove unused import 2014-11-26 21:52:30 +00:00
Pedro Algarvio
aaf0f4aba0 Fix imports 2014-11-26 21:08:13 +00:00