[saga-project/BigJob] bc2a5e: re-created AL's EC2 fixes in develop-prod

[Ole Weidner]

Branch: refs/heads/feature/getworkingdir
Home: https://github.com/saga-project/BigJob
Commit: bc2a5e4611a69a578bb51521cf0318b336ef5a51
https://github.com/saga-project/BigJob/commit/bc2a5e4611a69a578bb51521cf0318b336ef5a51
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M bigjob/bigjob_manager.py
M bigjob/job_plugin/ec2ssh.py
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
re-created AL's EC2 fixes in develop-prod


Commit: 79c84f13ed4c64bba4c5f7d8a3d51a0d52cef70b
https://github.com/saga-project/BigJob/commit/79c84f13ed4c64bba4c5f7d8a3d51a0d52cef70b
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M setup.py

Log Message:
-----------
sigh...


Commit: 3ca0c57163b2f1f0e770bda45628a836a8410dab
https://github.com/saga-project/BigJob/commit/3ca0c57163b2f1f0e770bda45628a836a8410dab
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M MANIFEST.in

Log Message:
-----------
added VERSION


Commit: fe8599b7f7cfd33572f263ad541353256dd443c2
https://github.com/saga-project/BigJob/commit/fe8599b7f7cfd33572f263ad541353256dd443c2
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M bigjob/bigjob_manager.py
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
fixed Anajni's problem


Commit: e08e503cd363fa04d3ba5b0019db2b71d1dd0dbd
https://github.com/saga-project/BigJob/commit/e08e503cd363fa04d3ba5b0019db2b71d1dd0dbd
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths:
M README.md
M bigjob.conf
M bigjob/bigjob_agent.py
M bigjob/bigjob_manager.py
M bigjob/job_plugin/ec2ssh.py
M coordination/bigjob_coordination_redis.py
M examples/pilot-api/example-pilot-api.py
M pilot/impl/pilot_manager_decentral.py
M pilot/impl/pilotcompute_manager.py
M setup.py
M tests/performance/throughput.py

Log Message:
-----------
Merge branch 'master' into develop-prod

Conflicts:
bigjob/bigjob_manager.py
bigjob/job_plugin/ec2ssh.py
pilot/impl/pilotcompute_manager.py


Commit: d22475bb3b743bb6bb030d408a3be2ac7f4a3f57
https://github.com/saga-project/BigJob/commit/d22475bb3b743bb6bb030d408a3be2ac7f4a3f57
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths:
M bigjob/job_plugin/ec2ssh.py

Log Message:
-----------
accidentally commited unmerged conflict


Commit: 1c9fc04484f159eae874295c099a99439dbfff5a
https://github.com/saga-project/BigJob/commit/1c9fc04484f159eae874295c099a99439dbfff5a
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths:
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
another missed conflict :/


Commit: cceb86ff259be0b8c198831673f546d0cc2329a8
https://github.com/saga-project/BigJob/commit/cceb86ff259be0b8c198831673f546d0cc2329a8
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-12 (Mon, 12 Aug 2013)

Changed paths:
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
re-added a method that was lost in action


Commit: b48d3c2eabc4ff07bbc390e647167f58daf2ea94
https://github.com/saga-project/BigJob/commit/b48d3c2eabc4ff07bbc390e647167f58daf2ea94
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-14 (Wed, 14 Aug 2013)

Changed paths:
M bigjob/bigjob_manager.py

Log Message:
-----------
another attempt to fix the working_directory issue


Commit: 51f41a61c885f27ab3b9001280b561e3f779e82e
https://github.com/saga-project/BigJob/commit/51f41a61c885f27ab3b9001280b561e3f779e82e
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-24 (Sat, 24 Aug 2013)

Changed paths:
M pilot/filemanagement/ssh_adaptor.py
M pilot/impl/pilot_manager_decentral.py
M pilot/impl/pilotcompute_manager.py
M pilot/impl/pilotdata_manager.py

Log Message:
-----------
Merge branch 'master' into feature/getworkingdir


Commit: 295f099eea6685a122f0d85d765ebe76925e9482
https://github.com/saga-project/BigJob/commit/295f099eea6685a122f0d85d765ebe76925e9482
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-24 (Sat, 24 Aug 2013)

Changed paths:
M setup.py

Log Message:
-----------
reverting to 'BigJob'


Compare: https://github.com/saga-project/BigJob/compare/663e1fd2f163...295f099eea66

To unsubscribe from these emails, change your notification settings at https://github.com/saga-project/BigJob/settings/notifications