review.tizen.org Git - tools/python-jenkinsapi.git/commit

projects / tools / python-jenkinsapi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3bdca61 59d4e3c)

author	Aleksey Maksimov <ctpeko3a@gmail.com>
	Sat, 12 Apr 2014 13:56:25 +0000 (21:56 +0800)
committer	Aleksey Maksimov <ctpeko3a@gmail.com>
	Sat, 12 Apr 2014 13:56:25 +0000 (21:56 +0800)
commit	61573357e6571cdd5478243d094e76cc6062f299
tree	f80a41ca87b3a888277926cb2a9958261b42375b	tree \| snapshot
parent	3bdca619ba3f3481326ab60c4dcbf851229e26fa	commit \| diff
parent	59d4e3c5f008acbcd8f768931c3b6280fbca3082	commit \| diff

Merge remote-tracking branch 'upstream/python3_experimental' into python3_experimental

Conflicts:
jenkinsapi/fingerprint.py

README.rst	diff1 \|	diff2 \|	blob \| history
jenkinsapi/api.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi/fingerprint.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi/jenkins.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi/job.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi/jobs.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi/node.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi/plugins.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi/view.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi_tests/unittests/test_jenkins.py	diff1 \|	diff2 \|	blob \| history
jenkinsapi_tests/unittests/test_job.py	diff1 \|	diff2 \|	blob \| history

Domain: SCM / Build;