valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
100,927 Commits 24 Branches 182 Tags 341 MiB
89f0bd8820
Commit Graph

70 Commits

Author SHA1 Message Date
Pedro Algarvio
01b74c06c4
Add initial nox configuration. Tell tox'ers to use nox'. 2019-02-20 16:49:56 +00:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04:00
Daniel Wallace
d53b44d10f
remove lock file 2018-05-13 14:35:50 -04:00
Daniel Wallace
e0f7cc1447
add proxy tests decorator to pytest conftest 2018-05-13 08:38:38 -04:00
Daniel Wallace
f56f062a6a
download xml for junit 2017-12-31 11:10:16 -07:00
Daniel Wallace
7cc342a5d6
use new runtests verifier 2017-12-31 11:10:01 -07:00
Daniel Wallace
8cb15ec689
download xml for junit 2017-12-29 15:00:54 -07:00
Daniel Wallace
d9e868ebd0
use new runtests verifier 2017-12-29 14:23:59 -07:00
Mike Place
27e80e4627
Merge branch 'develop' into add-cloud.vmware.convert_to_snapshot-feature 2017-11-13 11:28:27 -07:00
rallytime
1c3cb5c6a4
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - .gitignore
  - tests/unit/states/test_file.py
 2017-10-25 10:04:08 -04:00
Daniel Wallace
255118cfd7
run tests with kitchen 2017-10-24 09:23:44 -06:00
Daniel Wallace
b8c800e4a7
start adding kitchen to test suites 2017-10-17 14:59:10 -06:00
Daniel Wallace
51eca1a6bd
enable tox for tests 2017-10-03 17:01:19 -06:00
Dmitry Miroshnichenko
e37d2c9184 First lesson - before reading the answer 2017-03-25 00:36:28 +03:00
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09:00
Mike Place
430ea9e780 Revert "Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running" 2016-10-20 19:48:59 +09:00
Andrew Pashkin
27bc7aad91 Add Visual Studio Code related directory .vscode/ to .gitignore 2016-10-12 13:21:40 -06:00
Andrew Pashkin
304516420c Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running (#36875) 
* Add Visual Studio Code related directory .vscode/ to .gitignore

* Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running
 2016-10-12 13:20:30 -06:00
Tim Fechner
d232d70135 Add "/env/" to .gitignore 2016-09-21 13:28:49 +02:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
 2016-04-26 14:42:26 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
 2016-04-26 12:07:42 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
 2016-04-25 15:45:17 -06:00
Nitin Madhok
4568565d45 Add _syspaths.py to .gitignore (#32638) 2016-04-18 08:40:54 -06:00
LoveIsGrief
43fff23cae Ignore private keys generated by integration tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
5867b82ac6 Ignore test log files 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
b1faa8f037 Ignore the log directory created by tests 2016-02-10 21:38:11 +01:00
LoveIsGrief
516a2428bc Ignore pycharm files 2016-02-10 21:37:31 +01:00
Richard Hansen
d9be4c69a1 only ignore virtualenv directories at the top 
To avoid collateral damage, only ignore the virtualenv directories if
they appear at the top of the working directory.

Also, only ignore lib64 if it is a directory (mostly to match the
other entries).
 2015-10-09 17:47:56 -04:00
Richard Hansen
db08d874a6 ignore more virtualenv directories 2015-10-09 17:47:56 -04:00
Jerzy Drozdz
03c32e40b7 .gitignore update 2015-05-28 00:40:31 +02:00
Jerzy Drozdz
1d30f32540 Added new RH route template for RHEL6 and newer 2015-05-28 00:02:53 +02:00
Felix Dreissig
6828c4b112 Remove Tox config 
The 'tox.ini' file looks like an artifact from the past. It is unusable
at least since requirements have been moved to their own directory.
 2015-04-18 21:11:30 +02:00
Julien Lavergne
1c91622fa6 added recursive ignored vagrant project files 2015-04-17 18:51:26 +02:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Erik Johnson
4807d7d3da Ignore file cache created by jinja tests 2015-01-26 13:10:54 -06:00
Mike Place
8e504f09d1 Ignore some auto-generated files in test dir 2015-01-13 11:02:52 -07:00
James Michael DuPont
e6e7ab6cbc rooted config 
* updated documentation
* troubleshooting
* Itegrated comments and feedback
* bugfixes to format and language
* linting the changes
 2015-01-01 07:07:09 -06:00
Nitin Madhok
04182825d9 Adding src folder to .gitignore to Ignore commiting unit test runs 2014-12-19 09:03:59 -05:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
 2014-11-18 12:46:29 -07:00
Elias Probst
a39dfb98a2 Add 'lib64' to .gitignore which might be created by 'virtualenv'. 
On 64bit systems, 'lib64' might be created as a symlink to './lib'.
 2014-11-18 17:05:15 +01:00
Justin Findlay
9d5615dcc1 gitignore extended vim swap files 2014-11-07 16:50:55 -07:00
Henrik Holmboe
f9ecb86e9a Ignore flymake files produced by Emacs Elpy 2014-11-03 21:28:03 +01:00
dsumsky
07ca8d8479 - raise SaltClientError exception when a minion can't connect to 
any of the configured masters
 2014-09-04 13:43:40 -06:00
Mike Place
10f7a5170c Git ignore 2014-08-11 14:32:17 -06:00
Mike Place
72590d4579 Allow a user to set their own _version.py for testing 
ignore in git
 2014-06-12 13:41:03 -06:00
techdragon
4228630f14 ignore sublime text project files like other IDEs 2014-02-20 19:23:43 +08:00
Bret Palsson
5b390e8352 Ignore IntelliJ Module Library file 2014-01-17 14:49:19 -07:00
Michael Birtwell
18fffe6ea3 Only ignore build in top level 2013-11-13 14:57:27 +00:00
Pedro Algarvio
22321eed83 Merge pull request #7804 from holmboe/rope-prj 
Ignore rope project files
 2013-10-14 02:59:23 -07:00