summaryrefslogtreecommitdiffstats
path: root/git/parent.py
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-29 16:39:32 -0500
committerGitHub <noreply@github.com>2016-11-29 16:39:32 -0500
commite4a010aa08356e10fab9e9a4904dbd8491a74b8f (patch)
treed146f1e12c8efb25fac17eff70e5e38d8d7db511 /git/parent.py
parentf5a8207ad149fe8e67621b0b8fb585a48b3a1ca0 (diff)
parent81d8b6a835de79f18b2cae87b7b58ba4d02f0b14 (diff)
downloadopenshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.gz
openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.bz2
openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.xz
openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.zip
Merge pull request #2855 from detiber/updateSchedulerDefaults
Update scheduler defaults
Diffstat (limited to 'git/parent.py')
-rwxr-xr-xgit/parent.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git/parent.py b/git/parent.py
index 154a02350..92f57df3e 100755
--- a/git/parent.py
+++ b/git/parent.py
@@ -1,4 +1,6 @@
#!/usr/bin/env python
+# flake8: noqa
+# pylint: skip-file
'''
Script to determine if this commit has also
been merged through the stage branch
@@ -93,4 +95,3 @@ def main():
if __name__ == '__main__':
main()
-