 Colton Myers
|
785f1575e8
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
|
9 years ago |
|
Colton Myers
|
187268d879
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
9 years ago |
|
Jay Bendon
|
c6a501ebda
quick fix for issue #18447
|
9 years ago |
|
Pedro Algarvio
|
a138a7b83c
SPM also works on windows
|
9 years ago |
|
Pedro Algarvio
|
ac086c9311
Add the spm script to `setup.py`
|
9 years ago |
|
rallytime
|
9a6b159422
Remove SALT_CLOUD_REQS from setup.py --> develop
|
9 years ago |
|
rallytime
|
48769a544d
Remove SALT_CLOUD_REQS from setup.py
|
9 years ago |
|
Thomas S Hatch
|
cf1c77fc90
Merge pull request #21416 from haim0n/develop
|
9 years ago |
|
Colton Myers
|
fd93491a5f
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
bdfdd3f232
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
9 years ago |
|
Justin Findlay
|
e6f8ea3c7c
Don't obfuscate internal distutils attributes
|
9 years ago |
|
Pedro Algarvio
|
e5a7158069
Don't obfuscate the internal version attribute
|
9 years ago |
|
Haim Daniel
|
178b61033d
setup.py: fix "invalid command name" error from distutils.dist for
|
9 years ago |
|
Erik Johnson
|
94d55889d7
Resolve merge conflicts
|
9 years ago |
|
Erik Johnson
|
b23a8788c1
Add imp to windows freezer_includes
|
9 years ago |
|
Erik Johnson
|
ae5cad196c
Add imp to windows freezer_includes
|
9 years ago |
|
Mikhail Matyunin
|
91200a25e6
Remove breaking "Static" word on line 647
|
10 years ago |
|
Mikhail Matyunin
|
71cc779309
Code block start comment typo
|
10 years ago |
|
Pedro Algarvio
|
74e513f6f3
Fix requirements files paths
|
10 years ago |
|
Pedro Algarvio
|
e2e535824a
Use `SaltStackVersion` since we don't yet know when Boron will come out
|
10 years ago |
|
Pedro Algarvio
|
3f14678796
Throw an error when the time comes to remove the deprecated code.
|
10 years ago |
|
Pedro Algarvio
|
8a6e0a38ed
Remove unnecessary code
|
10 years ago |
|
Pedro Algarvio
|
b2c710e375
Salt path options are now global and default to None.
|
10 years ago |
|
Anton D
|
e8a50ffc5c
Explicitly include stdlib csv module in esky build. Fixes missing csv module in Windows builds.
|
10 years ago |
|
Anton D
|
71cc402eb7
Explicitly include stdlib csv module in esky build. Fixes missing csv module in Windows builds.
|
10 years ago |
|
Colton Myers
|
dc43840cee
Merge branch '2014.7' into merge-forward
|
10 years ago |
|
Pedro Algarvio
|
253fc45a28
Add missing comma
|
10 years ago |
|
Colton Myers
|
9a89057f83
Merge branch '2014.7' into merge-forward
|
10 years ago |
|
Pedro Algarvio
|
f1d2fd8215
Re-enable setuptools `console_scripts`
|
10 years ago |
|
Pedro Algarvio
|
56f68a1639
Don't update from attributes starting with `__`
|
10 years ago |
